Skip to content

Commit 13d3857

Browse files
rolfbjarnerolfbjarne
committed
Merge remote-tracking branch 'origin/main' into dev/rolf/foundation-nullability-19-nsset
2 parents 89ec538 + b6939d0 commit 13d3857

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+454
-268
lines changed

‎.github/workflows/autoformat.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
steps:
1414
- name: 'Checkout'
15-
uses: actions/checkout@v5
15+
uses: actions/checkout@v6
1616
with:
1717
fetch-depth: 0
1818
repository: ${{ github.event.pull_request.head.repo.full_name }}

‎.github/workflows/bump-global-json.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
if: contains(github.event.pull_request.title, 'Update dependencies from dotnet/') && github.actor == 'dotnet-maestro[bot]'
1414
steps:
1515
- name: 'Checkout repo'
16-
uses: actions/checkout@v5
16+
uses: actions/checkout@v6
1717
with:
1818
fetch-depth: 0
1919
repository: ${{ github.event.pull_request.head.repo.full_name }}

‎.github/workflows/localization-update.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
name: '[Localization PR to main]'
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v5
18+
- uses: actions/checkout@v6
1919
name: checkout
2020

2121
- uses: repo-sync/pull-request@v2

‎.github/workflows/pwsh-ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
test-pwsh:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v5
13+
- uses: actions/checkout@v6
1414
- name: Run Pester tests
1515
run: |
1616
Set-PSRepository psgallery -InstallationPolicy trusted

‎.github/workflows/update-single-platform-branches.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Checkout repo
22-
uses: actions/checkout@v5
22+
uses: actions/checkout@v6
2323
with:
2424
fetch-depth: 0
2525

‎.github/workflows/yamllint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
steps:
1515
- name: 'Checkout'
16-
uses: actions/checkout@v5
16+
uses: actions/checkout@v6
1717
with:
1818
token: ${{ secrets.GITHUB_TOKEN }}
1919
fetch-depth: 0

‎NuGet.config‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
<clear />
1111
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1212
<!-- Begin: Package sources from dotnet-dotnet -->
13-
<add key="darc-pub-dotnet-dotnet-4090eb3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-4090eb30/nuget/v3/index.json" />
13+
<add key="darc-pub-dotnet-dotnet-20abd87" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-20abd876/nuget/v3/index.json" />
1414
<!-- End: Package sources from dotnet-dotnet -->
1515
<!-- Begin: Package sources from dotnet-macios -->
16-
<add key="darc-pub-dotnet-macios-4177c9d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-4177c9d9/nuget/v3/index.json" />
16+
<add key="darc-pub-dotnet-macios-ab5c9f5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-ab5c9f5f/nuget/v3/index.json" />
1717
<!-- End: Package sources from dotnet-macios -->
1818
<!-- Begin: Package sources from xamarin-xamarin-macios -->
1919
<!-- End: Package sources from xamarin-xamarin-macios -->
@@ -36,6 +36,8 @@
3636
<add key="local-tests-feed" value="tests/.nuget/packages" />
3737
<!-- Add a 8.0.22 feed -->
3838
<add key="darc-pub-dotnet-runtime-ad2d4fbc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ad2d4fbc/nuget/v3/index.json" />
39+
<!-- Add a 8.0.23 feed -->
40+
<add key="darc-pub-dotnet-runtime-891f8976" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-891f8976/nuget/v3/index.json" />
3941
<!-- Add a 9.0.11 feed -->
4042
<add key="darc-pub-dotnet-runtime-35fe9c61" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-35fe9c61/nuget/v3/index.json" />
4143
<!-- Add a 9.0.12 feed -->

‎docs/api/Foundation/NSUrlSessionDownloadTaskRequest.xml‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎dotnet/targets/Microsoft.MaciOS.Sdk.Xcode.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ This file contains MSBuild targets that support building Xcode framework project
1313
<UsingTask TaskName="Xamarin.MacDev.Tasks.CreateXcFramework" AssemblyFile="$(_XamarinTaskAssembly)"/>
1414

1515
<PropertyGroup>
16-
<_XcodeProjectDefaultOutputPathRoot>$(MSBuildProjectDirectory)/$(IntermediateOutputPath)xcode/</_XcodeProjectDefaultOutputPathRoot>
16+
<_XcodeProjectDefaultOutputPathRoot>$(IntermediateOutputPath)xcode/</_XcodeProjectDefaultOutputPathRoot>
1717
<_BuildXcodeProjectsStamp>$(_MaciOSStampDirectory)_BuildXcodeProjects.stamp</_BuildXcodeProjectsStamp>
1818
</PropertyGroup>
1919

‎eng/Version.Details.props‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,36 +6,36 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25569.104</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25569.104</MicrosoftDotNetBuildTasksFeedPackageVersion>
11-
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25569.104</MicrosoftDotNetCecilPackageVersion>
12-
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25569.104</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
13-
<MicrosoftNETILLinkPackageVersion>10.0.1-servicing.25569.104</MicrosoftNETILLinkPackageVersion>
14-
<MicrosoftNETILLinkTasksPackageVersion>10.0.1</MicrosoftNETILLinkTasksPackageVersion>
15-
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>10.0.1</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
16-
<MicrosoftNETSdkPackageVersion>10.0.101-servicing.25569.104</MicrosoftNETSdkPackageVersion>
17-
<MicrosoftNETCoreAppRefPackageVersion>10.0.1</MicrosoftNETCoreAppRefPackageVersion>
18-
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.101</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25576.107</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25576.107</MicrosoftDotNetBuildTasksFeedPackageVersion>
11+
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25576.107</MicrosoftDotNetCecilPackageVersion>
12+
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25576.107</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
13+
<MicrosoftNETILLinkPackageVersion>10.0.2-servicing.25576.107</MicrosoftNETILLinkPackageVersion>
14+
<MicrosoftNETILLinkTasksPackageVersion>10.0.2</MicrosoftNETILLinkTasksPackageVersion>
15+
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>10.0.2</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
16+
<MicrosoftNETSdkPackageVersion>10.0.102-servicing.25576.107</MicrosoftNETSdkPackageVersion>
17+
<MicrosoftNETCoreAppRefPackageVersion>10.0.2</MicrosoftNETCoreAppRefPackageVersion>
18+
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.102</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
1919
<!-- dotnet/macios dependencies -->
2020
<MicrosoftiOSSdknet100_260PackageVersion>26.0.11017</MicrosoftiOSSdknet100_260PackageVersion>
2121
<MicrosoftiOSSdknet90_185PackageVersion>18.5.9227</MicrosoftiOSSdknet90_185PackageVersion>
22-
<MicrosoftiOSSdknet90_260PackageVersion>26.0.9754</MicrosoftiOSSdknet90_260PackageVersion>
22+
<MicrosoftiOSSdknet90_260PackageVersion>26.0.9777</MicrosoftiOSSdknet90_260PackageVersion>
2323
<MicrosoftMacCatalystSdknet100_260PackageVersion>26.0.11017</MicrosoftMacCatalystSdknet100_260PackageVersion>
2424
<MicrosoftMacCatalystSdknet90_185PackageVersion>18.5.9227</MicrosoftMacCatalystSdknet90_185PackageVersion>
25-
<MicrosoftMacCatalystSdknet90_260PackageVersion>26.0.9754</MicrosoftMacCatalystSdknet90_260PackageVersion>
25+
<MicrosoftMacCatalystSdknet90_260PackageVersion>26.0.9777</MicrosoftMacCatalystSdknet90_260PackageVersion>
2626
<MicrosoftmacOSSdknet100_260PackageVersion>26.0.11017</MicrosoftmacOSSdknet100_260PackageVersion>
2727
<MicrosoftmacOSSdknet90_155PackageVersion>15.5.9227</MicrosoftmacOSSdknet90_155PackageVersion>
28-
<MicrosoftmacOSSdknet90_260PackageVersion>26.0.9754</MicrosoftmacOSSdknet90_260PackageVersion>
28+
<MicrosoftmacOSSdknet90_260PackageVersion>26.0.9777</MicrosoftmacOSSdknet90_260PackageVersion>
2929
<MicrosofttvOSSdknet100_260PackageVersion>26.0.11017</MicrosofttvOSSdknet100_260PackageVersion>
3030
<MicrosofttvOSSdknet90_185PackageVersion>18.5.9227</MicrosofttvOSSdknet90_185PackageVersion>
31-
<MicrosofttvOSSdknet90_260PackageVersion>26.0.9754</MicrosofttvOSSdknet90_260PackageVersion>
31+
<MicrosofttvOSSdknet90_260PackageVersion>26.0.9777</MicrosofttvOSSdknet90_260PackageVersion>
3232
<!-- xamarin/xamarin-macios dependencies -->
3333
<MicrosoftiOSSdknet90_180PackageVersion>18.0.9617</MicrosoftiOSSdknet90_180PackageVersion>
3434
<MicrosoftMacCatalystSdknet90_180PackageVersion>18.0.9617</MicrosoftMacCatalystSdknet90_180PackageVersion>
3535
<MicrosoftmacOSSdknet90_150PackageVersion>15.0.9617</MicrosoftmacOSSdknet90_150PackageVersion>
3636
<MicrosofttvOSSdknet90_180PackageVersion>18.0.9617</MicrosofttvOSSdknet90_180PackageVersion>
3737
<!-- dotnet/xharness dependencies -->
38-
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>11.0.0-prerelease.25569.2</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
38+
<MicrosoftDotNetXHarnessiOSSharedPackageVersion>11.0.0-prerelease.25575.1</MicrosoftDotNetXHarnessiOSSharedPackageVersion>
3939
</PropertyGroup>
4040
<!--Property group for alternate package version names-->
4141
<PropertyGroup>

0 commit comments

Comments
 (0)