Skip to content

Commit 5a17c99

Browse files
github-actions[bot]CopilotmarcpopMSFTdotnet-maestro[bot]SimonZhao888
authored
[automated] Merge branch 'release/10.0.2xx' => 'main' (#51540)
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: marcpopMSFT <12663534+marcpopMSFT@users.noreply.github.com> Co-authored-by: Marc Paine <marcpop@microsoft.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: SimonZhao888 <133954995+SimonZhao888@users.noreply.github.com> Co-authored-by: Tomáš Matoušek <tmat@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Ilona Tomkowicz <itomkowicz@microsoft.com> Co-authored-by: Simon Zhao (BEYONDSOFT CONSULTING INC) <v-weidzh@microsoft.com> Co-authored-by: Youssef Victor <youssefvictor00@gmail.com> Co-authored-by: Marek Fišera <mara@neptuo.com> Co-authored-by: Daniel Plaisted <daplaist@microsoft.com> Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Chet Husk <baronfel@users.noreply.github.com> Co-authored-by: Jacques Eloff <joeloff@users.noreply.github.com> Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com> Co-authored-by: Eric StJohn <ericstj@microsoft.com> Co-authored-by: Jan Jones <janjones@microsoft.com> Co-authored-by: stephentoub <2642209+stephentoub@users.noreply.github.com> Co-authored-by: DonnaChen888 <v-donnachen@microsoft.com> Co-authored-by: Eirik Tsarpalis <eirik.tsarpalis@gmail.com>
1 parent 9ecb92d commit 5a17c99

File tree

103 files changed

+1118
-422
lines changed

Some content is hidden

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

103 files changed

+1118
-422
lines changed

.github/copilot-instructions.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,3 +34,8 @@ Localization:
3434

3535
Documentation:
3636
- Do not manually edit files under documentation/manpages/sdk as these are generated based on documentation and should not be manually modified.
37+
38+
External Dependencies:
39+
- Changes that require modifications to the dotnet/templating repository (Microsoft.TemplateEngine packages) should be made directly in that repository, not worked around in this repo.
40+
- The dotnet/templating repository owns the TemplateEngine.Edge, TemplateEngine.Abstractions, and related packages.
41+
- If a change requires updates to template engine behavior or formatting (e.g., DisplayName properties), file an issue in dotnet/templating and make the changes there rather than adding workarounds in this SDK repository.

.vsts-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ trigger:
55
branches:
66
include:
77
- main
8-
- release/10.0.1*
8+
- release/10.0.2*
99
- internal/release/*
1010
- exp/*
1111

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<PackageVersion Include="Microsoft.DotNet.Build.Tasks.Workloads" Version="$(MicrosoftDotNetBuildTasksWorkloadsPackageVersion)" />
5353
<PackageVersion Include="Microsoft.DotNet.Installer.Windows.Security.TestData" Version="$(MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion)" />
5454
<PackageVersion Include="Microsoft.DotNet.SignCheck" Version="$(ArcadeSdkVersion)" />
55-
<PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsVersion)" />
55+
<PackageVersion Include="Microsoft.DotNet.XUnitExtensions" Version="$(MicrosoftDotNetXUnitExtensionsPackageVersion)" />
5656
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelPackageVersion)" />
5757
<PackageVersion Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)" />
5858
<PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingPackageVersion)" />

NuGet.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
<packageSources>
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6+
<!-- Begin: Package sources from dotnet-dotnet -->
7+
<!-- End: Package sources from dotnet-dotnet -->
68
<!-- Begin: Package sources from microsoft-testfx -->
79
<!-- End: Package sources from microsoft-testfx -->
810
<!-- Begin: Package sources from dotnet-aspire -->

eng/SourcePackage.netframework.editorconfig

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,32 @@ dotnet_diagnostic.CS1573.severity = none
1818
dotnet_diagnostic.IDE0005.severity = none
1919

2020
# Disable nullability checks when targeting .NET Framework
21-
dotnet_diagnostic.CS8604.severity = none
21+
dotnet_diagnostic.CS8774.severity = none # Member not null
22+
dotnet_diagnostic.CS8775.severity = none # Member not null when
23+
dotnet_diagnostic.CS8776.severity = none # Member not null bad member
24+
dotnet_diagnostic.CS8777.severity = none # Parameter disallows null
25+
dotnet_diagnostic.CS8778.severity = none # Const out of range checked
26+
dotnet_diagnostic.CS8600.severity = none # Converting nullable to non-nullable
27+
dotnet_diagnostic.CS8601.severity = none # Null reference assignment
28+
dotnet_diagnostic.CS8602.severity = none # Null reference receiver
29+
dotnet_diagnostic.CS8603.severity = none # Null reference return
30+
dotnet_diagnostic.CS8604.severity = none # Null reference argument
31+
dotnet_diagnostic.CS8605.severity = none # Unbox possible null
32+
dotnet_diagnostic.CS8607.severity = none # Disallow null attribute forbids maybe null assignment
33+
dotnet_diagnostic.CS8608.severity = none # Nullability mismatch in type on override
34+
dotnet_diagnostic.CS8609.severity = none # Nullability mismatch in return type on override
35+
dotnet_diagnostic.CS8610.severity = none # Nullability mismatch in parameter type on override
36+
dotnet_diagnostic.CS8611.severity = none # Nullability mismatch in parameter type on partial
37+
dotnet_diagnostic.CS8612.severity = none # Nullability mismatch in type on implicit implementation
38+
dotnet_diagnostic.CS8613.severity = none # Nullability mismatch in return type on implicit implementation
39+
dotnet_diagnostic.CS8614.severity = none # Nullability mismatch in parameter type on implicit implementation
40+
dotnet_diagnostic.CS8615.severity = none # Nullability mismatch in type on explicit implementation
41+
dotnet_diagnostic.CS8616.severity = none # Nullability mismatch in return type on explicit implementation
42+
dotnet_diagnostic.CS8617.severity = none # Nullability mismatch in parameter type on explicit implementation
43+
dotnet_diagnostic.CS8618.severity = none # Uninitialized non-nullable field
44+
dotnet_diagnostic.CS8619.severity = none # Nullability mismatch in assignment
45+
dotnet_diagnostic.CS8620.severity = none # Nullability mismatch in argument
46+
dotnet_diagnostic.CS8621.severity = none # Nullability mismatch in return type of target delegate
47+
dotnet_diagnostic.CS8622.severity = none # Nullability mismatch in parameter type of target delegate
48+
dotnet_diagnostic.CS8624.severity = none # Nullability mismatch in argument for output
49+
dotnet_diagnostic.CS8625.severity = none # Null as non-nullable

eng/SourcePackage.netstandard.editorconfig

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,32 @@ dotnet_diagnostic.CS1573.severity = none
1818
dotnet_diagnostic.IDE0005.severity = none
1919

2020
# Disable nullability checks when targeting netstandard2.0
21-
dotnet_diagnostic.CS8604.severity = none
21+
dotnet_diagnostic.CS8774.severity = none # Member not null
22+
dotnet_diagnostic.CS8775.severity = none # Member not null when
23+
dotnet_diagnostic.CS8776.severity = none # Member not null bad member
24+
dotnet_diagnostic.CS8777.severity = none # Parameter disallows null
25+
dotnet_diagnostic.CS8778.severity = none # Const out of range checked
26+
dotnet_diagnostic.CS8600.severity = none # Converting nullable to non-nullable
27+
dotnet_diagnostic.CS8601.severity = none # Null reference assignment
28+
dotnet_diagnostic.CS8602.severity = none # Null reference receiver
29+
dotnet_diagnostic.CS8603.severity = none # Null reference return
30+
dotnet_diagnostic.CS8604.severity = none # Null reference argument
31+
dotnet_diagnostic.CS8605.severity = none # Unbox possible null
32+
dotnet_diagnostic.CS8607.severity = none # Disallow null attribute forbids maybe null assignment
33+
dotnet_diagnostic.CS8608.severity = none # Nullability mismatch in type on override
34+
dotnet_diagnostic.CS8609.severity = none # Nullability mismatch in return type on override
35+
dotnet_diagnostic.CS8610.severity = none # Nullability mismatch in parameter type on override
36+
dotnet_diagnostic.CS8611.severity = none # Nullability mismatch in parameter type on partial
37+
dotnet_diagnostic.CS8612.severity = none # Nullability mismatch in type on implicit implementation
38+
dotnet_diagnostic.CS8613.severity = none # Nullability mismatch in return type on implicit implementation
39+
dotnet_diagnostic.CS8614.severity = none # Nullability mismatch in parameter type on implicit implementation
40+
dotnet_diagnostic.CS8615.severity = none # Nullability mismatch in type on explicit implementation
41+
dotnet_diagnostic.CS8616.severity = none # Nullability mismatch in return type on explicit implementation
42+
dotnet_diagnostic.CS8617.severity = none # Nullability mismatch in parameter type on explicit implementation
43+
dotnet_diagnostic.CS8618.severity = none # Uninitialized non-nullable field
44+
dotnet_diagnostic.CS8619.severity = none # Nullability mismatch in assignment
45+
dotnet_diagnostic.CS8620.severity = none # Nullability mismatch in argument
46+
dotnet_diagnostic.CS8621.severity = none # Nullability mismatch in return type of target delegate
47+
dotnet_diagnostic.CS8622.severity = none # Nullability mismatch in parameter type of target delegate
48+
dotnet_diagnostic.CS8624.severity = none # Nullability mismatch in argument for output
49+
dotnet_diagnostic.CS8625.severity = none # Null as non-nullable

eng/Version.Details.props

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ This file should be imported by eng/Versions.props
146146
</PropertyGroup>
147147
<!--Property group for alternate package version names-->
148148
<PropertyGroup>
149-
<!-- dotnet/dotnet dependencies -->
149+
<!-- _git/dotnet-dotnet dependencies -->
150150
<dotnetdevcertsVersion>$(dotnetdevcertsPackageVersion)</dotnetdevcertsVersion>
151151
<dotnetuserjwtsVersion>$(dotnetuserjwtsPackageVersion)</dotnetuserjwtsVersion>
152152
<dotnetusersecretsVersion>$(dotnetusersecretsPackageVersion)</dotnetusersecretsVersion>
@@ -187,16 +187,8 @@ This file should be imported by eng/Versions.props
187187
<MicrosoftCodeAnalysisWorkspacesMSBuildVersion>$(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion)</MicrosoftCodeAnalysisWorkspacesMSBuildVersion>
188188
<MicrosoftDeploymentDotNetReleasesVersion>$(MicrosoftDeploymentDotNetReleasesPackageVersion)</MicrosoftDeploymentDotNetReleasesVersion>
189189
<MicrosoftDiaSymReaderVersion>$(MicrosoftDiaSymReaderPackageVersion)</MicrosoftDiaSymReaderVersion>
190-
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
191-
<MicrosoftDotNetBuildTasksInstallersVersion>$(MicrosoftDotNetBuildTasksInstallersPackageVersion)</MicrosoftDotNetBuildTasksInstallersVersion>
192-
<MicrosoftDotNetBuildTasksTemplatingVersion>$(MicrosoftDotNetBuildTasksTemplatingPackageVersion)</MicrosoftDotNetBuildTasksTemplatingVersion>
193-
<MicrosoftDotNetBuildTasksWorkloadsVersion>$(MicrosoftDotNetBuildTasksWorkloadsPackageVersion)</MicrosoftDotNetBuildTasksWorkloadsVersion>
194-
<MicrosoftDotNetHelixSdkVersion>$(MicrosoftDotNetHelixSdkPackageVersion)</MicrosoftDotNetHelixSdkVersion>
195-
<MicrosoftDotNetSignToolVersion>$(MicrosoftDotNetSignToolPackageVersion)</MicrosoftDotNetSignToolVersion>
196190
<MicrosoftDotNetWebItemTemplates100Version>$(MicrosoftDotNetWebItemTemplates100PackageVersion)</MicrosoftDotNetWebItemTemplates100Version>
197191
<MicrosoftDotNetWebProjectTemplates100Version>$(MicrosoftDotNetWebProjectTemplates100PackageVersion)</MicrosoftDotNetWebProjectTemplates100Version>
198-
<MicrosoftDotNetXliffTasksVersion>$(MicrosoftDotNetXliffTasksPackageVersion)</MicrosoftDotNetXliffTasksVersion>
199-
<MicrosoftDotNetXUnitExtensionsVersion>$(MicrosoftDotNetXUnitExtensionsPackageVersion)</MicrosoftDotNetXUnitExtensionsVersion>
200192
<MicrosoftExtensionsConfigurationIniVersion>$(MicrosoftExtensionsConfigurationIniPackageVersion)</MicrosoftExtensionsConfigurationIniVersion>
201193
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
202194
<MicrosoftExtensionsFileProvidersAbstractionsVersion>$(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion)</MicrosoftExtensionsFileProvidersAbstractionsVersion>
@@ -213,7 +205,6 @@ This file should be imported by eng/Versions.props
213205
<MicrosoftNETHostModelVersion>$(MicrosoftNETHostModelPackageVersion)</MicrosoftNETHostModelVersion>
214206
<MicrosoftNETILLinkTasksVersion>$(MicrosoftNETILLinkTasksPackageVersion)</MicrosoftNETILLinkTasksVersion>
215207
<MicrosoftNETRuntimeEmscripten3156Cachewinx64Version>$(MicrosoftNETRuntimeEmscripten3156Cachewinx64PackageVersion)</MicrosoftNETRuntimeEmscripten3156Cachewinx64Version>
216-
<MicrosoftNETRuntimeEmscriptenSdkInternalVersion>$(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion)</MicrosoftNETRuntimeEmscriptenSdkInternalVersion>
217208
<MicrosoftNETSdkRazorSourceGeneratorsTransportVersion>$(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion)</MicrosoftNETSdkRazorSourceGeneratorsTransportVersion>
218209
<MicrosoftNETSdkWindowsDesktopVersion>$(MicrosoftNETSdkWindowsDesktopPackageVersion)</MicrosoftNETSdkWindowsDesktopVersion>
219210
<MicrosoftNETTestSdkVersion>$(MicrosoftNETTestSdkPackageVersion)</MicrosoftNETTestSdkVersion>

eng/Versions.props

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@
3838
<VersionFeature60>36</VersionFeature60>
3939
<VersionFeature70>20</VersionFeature70>
4040
<!-- This version should be N-1 (ie the currently released version) in the preview branch but N-2 in main so that workloads stay behind the unreleased version -->
41-
<VersionFeature80>19</VersionFeature80>
42-
<VersionFeature90>8</VersionFeature90>
41+
<VersionFeature80>21</VersionFeature80>
42+
<VersionFeature90>10</VersionFeature90>
4343
<!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
4444
referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
4545
<_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>
4646
<!-- workload-specific version information -->
47-
<VersionFeature80ForWorkloads>$([MSBuild]::Add($(VersionFeature80), 1))</VersionFeature80ForWorkloads>
48-
<VersionFeature90ForWorkloads>$([MSBuild]::Add($(VersionFeature90), 1))</VersionFeature90ForWorkloads>
47+
<VersionFeature80ForWorkloads>$(VersionFeature80)</VersionFeature80ForWorkloads>
48+
<VersionFeature90ForWorkloads>$(VersionFeature90)</VersionFeature90ForWorkloads>
4949
</PropertyGroup>
5050
<PropertyGroup Label="Restore feeds">
5151
<!-- In an orchestrated build, this may be overridden to other Azure feeds. -->
@@ -142,13 +142,13 @@
142142
<BenchmarkDotNetPackageVersion>0.14.0</BenchmarkDotNetPackageVersion>
143143
</PropertyGroup>
144144
<PropertyGroup Label="Workload manifest package versions">
145-
<MauiFeatureBand>10.0.100-preview.6</MauiFeatureBand>
146-
<MauiWorkloadManifestVersion>10.0.0-preview.6.25359.8</MauiWorkloadManifestVersion>
147-
<XamarinAndroidWorkloadManifestVersion>36.0.0-preview.6.169</XamarinAndroidWorkloadManifestVersion>
148-
<XamarinIOSWorkloadManifestVersion>18.5.10415-net10-p6</XamarinIOSWorkloadManifestVersion>
149-
<XamarinMacCatalystWorkloadManifestVersion>18.5.10415-net10-p6</XamarinMacCatalystWorkloadManifestVersion>
150-
<XamarinMacOSWorkloadManifestVersion>15.5.10415-net10-p6</XamarinMacOSWorkloadManifestVersion>
151-
<XamarinTvOSWorkloadManifestVersion>18.5.10415-net10-p6</XamarinTvOSWorkloadManifestVersion>
145+
<MauiFeatureBand>10.0.100-rc.2</MauiFeatureBand>
146+
<MauiWorkloadManifestVersion>10.0.0-rc.2.25504.7</MauiWorkloadManifestVersion>
147+
<XamarinAndroidWorkloadManifestVersion>36.0.0-rc.2.332</XamarinAndroidWorkloadManifestVersion>
148+
<XamarinIOSWorkloadManifestVersion>26.0.10970-net10-rc.2</XamarinIOSWorkloadManifestVersion>
149+
<XamarinMacCatalystWorkloadManifestVersion>26.0.10970-net10-rc.2</XamarinMacCatalystWorkloadManifestVersion>
150+
<XamarinMacOSWorkloadManifestVersion>26.0.10970-net10-rc.2</XamarinMacOSWorkloadManifestVersion>
151+
<XamarinTvOSWorkloadManifestVersion>26.0.10970-net10-rc.2</XamarinTvOSWorkloadManifestVersion>
152152
</PropertyGroup>
153153
<PropertyGroup Label="Pinned dependency">
154154
<!-- This package is not being produced outside of the 2.0 branch of corefx and should not change. -->

eng/common/core-templates/steps/install-microbuild.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,16 @@ parameters:
2424
steps:
2525
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
2626
- ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
27-
# Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable
27+
# Installing .NET 8 is required to use the MicroBuild signing plugin on non-Windows platforms
2828
- task: UseDotNet@2
2929
displayName: Install .NET 8.0 SDK for MicroBuild Plugin
3030
inputs:
3131
packageType: sdk
3232
version: 8.0.x
33-
installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet
34-
workingDirectory: ${{ parameters.microBuildOutputFolder }}
33+
# Installing the SDK in a '.dotnet-microbuild' directory is required for signing.
34+
# See target FindDotNetPathForMicroBuild in arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
35+
# Do not remove '.dotnet-microbuild' from the path without changing the corresponding logic.
36+
installationPath: $(Agent.TempDirectory)/.dotnet-microbuild
3537
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
3638

3739
- script: |

sdk.slnx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,17 @@
4949
<Project Path="src/BuiltInTools/DotNetWatchTasks/DotNetWatchTasks.csproj" />
5050
<Project Path="src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.Package.csproj" />
5151
<Project Path="src/BuiltInTools/HotReloadAgent.Data/Microsoft.DotNet.HotReload.Agent.Data.shproj" />
52+
<Project Path="src/BuiltInTools/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.Package.csproj" />
53+
<Project Path="src/BuiltInTools/HotReloadAgent.Host/Microsoft.DotNet.HotReload.Agent.Host.shproj" />
5254
<Project Path="src/BuiltInTools/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.Package.csproj" />
5355
<Project Path="src/BuiltInTools/HotReloadAgent.PipeRpc/Microsoft.DotNet.HotReload.Agent.PipeRpc.shproj" />
5456
<Project Path="src/BuiltInTools/HotReloadAgent.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.csproj" />
5557
<Project Path="src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.Package.csproj" />
5658
<Project Path="src/BuiltInTools/HotReloadAgent/Microsoft.DotNet.HotReload.Agent.shproj" />
5759
<Project Path="src/BuiltInTools/HotReloadClient/Microsoft.DotNet.HotReload.Client.Package.csproj" />
58-
<Project Path="src/BuiltInTools/HotReloadClient/Microsoft.DotNet.HotReload.Client.shproj" Id="a78ff92a-d715-4249-9e3d-40d9997a098f" />
60+
<Project Path="src/BuiltInTools/HotReloadClient/Microsoft.DotNet.HotReload.Client.shproj" />
61+
<Project Path="src/BuiltInTools/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.Package.csproj" />
62+
<Project Path="src/BuiltInTools/Web.Middleware/Microsoft.DotNet.HotReload.Web.Middleware.shproj" />
5963
</Folder>
6064
<Folder Name="/src/Cli/">
6165
<Project Path="src/Cli/dotnet/dotnet.csproj" />

0 commit comments

Comments
 (0)