Merge branch 'main' into edvilme-slnfile

dotnet · Dec 19, 2024 · f367673 · f367673
2 parents 72a989f + a2e5bc2
commit f367673
Show file tree

Hide file tree

Showing 769 changed files with 19,621 additions and 4,721 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "microsoft.dotnet.darc": {
-      "version": "1.1.0-beta.24609.2",
+      "version": "1.1.0-beta.24618.2",
       "commands": [
         "darc"
       ]

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -93,14 +93,14 @@ extends:
         parameters:
           pool:
             name: $(DncEngInternalBuildPool)
-            image: 1es-windows-2022
+            image: windows.vs2022.amd64
             os: windows
           helixTargetQueue: windows.amd64.vs2022.pre
           oneESCompat:
             templateFolderName: templates-official
             publishTaskPrefix: 1ES.
           runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
-          locBranch: release/9.0.1xx
+          locBranch: release/9.0.2xx
           ${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}:
             timeoutInMinutes: 90
             windowsJobParameterSets:

diff --git a/CODEOWNERS b/CODEOWNERS
@@ -50,6 +50,10 @@
 /src/Cli/dotnet/commands/dotnet-vstest @dotnet/dotnet-testing-admin
 /test/dotnet-test.Tests @dotnet/dotnet-testing-admin
 /test/dotnet-vstest.Tests @dotnet/dotnet-testing-admin
+/test/dotnet-new.Tests @dotnet/dotnet-testing-admin
+/template_feed/Microsoft.DotNet.Common.*/content/MSTest* @dotnet/dotnet-testing-admin
+/template_feed/Microsoft.DotNet.Common.*/content/NUnit* @dotnet/dotnet-testing-admin
+/template_feed/Microsoft.DotNet.Common.*/content/XUnit* @dotnet/dotnet-testing-admin
 
 # Area-Templates
 /src/Cli/dotnet/commands/dotnet-new @dotnet/templating-engine-maintainers

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
 <Project>
+  <PropertyGroup>
+    <!--
+      Disable nullable warnings when targeting anything other than our supported .NET core version(s). 
+      This condition will be evaluated multiple times in multi-targeted projects hence need to be careful
+      to only set in the inner builds, not the outer build where only $(TargetFrameworks) is defined.
+      We still check $(TargetFrameworks) for empty though, because for single-targeted builds we want to
+      allow nullable warnings regardless of target framework.
+    -->
+    <NoWarn Condition="'$(DisableNullableWarnings)' == '' AND  '$(TargetFrameworks)' != '' AND '$(TargetFramework)' != '' AND '$(TargetFrameworkIdentifier)' != '.NETCoreApp'">$(NoWarn);Nullable</NoWarn>
+  </PropertyGroup>
 
   <ItemGroup>
     <SupportedPlatform Remove="Android" />

diff --git a/documentation/package-table.md b/documentation/package-table.md
@@ -163,21 +163,6 @@ Reference notes:
 [linux-arm64-targz-9.0.1XX]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-arm64.tar.gz
 [linux-arm64-targz-checksum-9.0.1XX]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-linux-arm64.tar.gz.sha512
 
-[rhel-6-badge-main]: https://aka.ms/dotnet/10.0.1xx/daily/rhel.6_x64_Release_version_badge.svg?no-cache
-[rhel-6-version-main]: https://aka.ms/dotnet/10.0.1xx/daily/productCommit-rhel.6-x64.txt
-[rhel-6-targz-main]: https://aka.ms/dotnet/10.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz
-[rhel-6-targz-checksum-main]: https://aka.ms/dotnet/10.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha512
-
-[rhel-6-badge-9.0.2XX]: https://aka.ms/dotnet/9.0.2xx/daily/rhel.6_x64_Release_version_badge.svg?no-cache
-[rhel-6-version-9.0.2XX]: https://aka.ms/dotnet/9.0.2xx/daily/productCommit-rhel.6-x64.txt
-[rhel-6-targz-9.0.2XX]: https://aka.ms/dotnet/9.0.2xx/daily/dotnet-sdk-rhel.6-x64.tar.gz
-[rhel-6-targz-checksum-9.0.2XX]: https://aka.ms/dotnet/9.0.2xx/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha512
-
-[rhel-6-badge-9.0.1XX]: https://aka.ms/dotnet/9.0.1xx/daily/rhel.6_x64_Release_version_badge.svg?no-cache
-[rhel-6-version-9.0.1XX]: https://aka.ms/dotnet/9.0.1xx/daily/productCommit-rhel.6-x64.txt
-[rhel-6-targz-9.0.1XX]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz
-[rhel-6-targz-checksum-9.0.1XX]: https://aka.ms/dotnet/9.0.1xx/daily/dotnet-sdk-rhel.6-x64.tar.gz.sha512
-
 [linux-musl-x64-badge-main]: https://aka.ms/dotnet/10.0.1xx/daily/linux_musl_x64_Release_version_badge.svg?no-cache
 [linux-musl-x64-version-main]: https://aka.ms/dotnet/10.0.1xx/daily/productCommit-linux-musl-x64.txt
 [linux-musl-x64-targz-main]: https://aka.ms/dotnet/10.0.1xx/daily/dotnet-sdk-linux-musl-x64.tar.gz

diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props
@@ -9,20 +9,20 @@
   Basically: In this file, choose the highest version when resolving merge conflicts.
  -->
   <PropertyGroup>
-    <MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.54</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
-    <MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.54</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
-    <MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.54</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
-    <MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.54</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
-    <MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.54</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
-    <MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.54</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
-    <MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>10.0.26100.54</MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>
-    <MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>10.0.17763.52</MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>
-    <MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>10.0.18362.52</MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>
-    <MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>10.0.19041.52</MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>
-    <MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>10.0.20348.52</MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>
-    <MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>10.0.22000.52</MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>
-    <MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>10.0.22621.52</MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>
-    <MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>10.0.26100.52</MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>
+    <MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.57</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
+    <MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.57</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
+    <MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.57</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
+    <MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>10.0.20348.57</MicrosoftWindowsSDKNETRef10_0_20348PackageVersion>
+    <MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>10.0.22000.57</MicrosoftWindowsSDKNETRef10_0_22000PackageVersion>
+    <MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>10.0.22621.57</MicrosoftWindowsSDKNETRef10_0_22621PackageVersion>
+    <MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>10.0.26100.57</MicrosoftWindowsSDKNETRef10_0_26100PackageVersion>
+    <MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>10.0.17763.55</MicrosoftWindowsSDKNETRef10_0_17763PackageVersionNet6>
+    <MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>10.0.18362.55</MicrosoftWindowsSDKNETRef10_0_18362PackageVersionNet6>
+    <MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>10.0.19041.55</MicrosoftWindowsSDKNETRef10_0_19041PackageVersionNet6>
+    <MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>10.0.20348.55</MicrosoftWindowsSDKNETRef10_0_20348PackageVersionNet6>
+    <MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>10.0.22000.55</MicrosoftWindowsSDKNETRef10_0_22000PackageVersionNet6>
+    <MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>10.0.22621.55</MicrosoftWindowsSDKNETRef10_0_22621PackageVersionNet6>
+    <MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>10.0.26100.55</MicrosoftWindowsSDKNETRef10_0_26100PackageVersionNet6>
   </PropertyGroup>
 
 </Project>
diff --git a/eng/Publishing.props b/eng/Publishing.props
@@ -14,7 +14,6 @@
     <SdkAssetManifestFileName>$(OS)-$(PlatformName)-SdkAssets$(SdkAssetManifestBuildPass).xml</SdkAssetManifestFileName>
     <SdkAssetsManifestFilePath>$(ArtifactsLogDir)AssetManifest\$(SdkAssetManifestFileName)</SdkAssetsManifestFilePath>
 
-    <TempWorkingDirectory>$(ArtifactsDir)\AssetsTmpDir\$([System.Guid]::NewGuid())</TempWorkingDirectory>
     <PublishBinariesAndBadge Condition=" '$(PublishBinariesAndBadge)' == '' ">true</PublishBinariesAndBadge>
 
     <IsStableBuild>false</IsStableBuild>
@@ -102,54 +101,47 @@
       <ItemsToSignPostBuild Include="@(ToolsetAssetsToPublish->'%(Filename)%(Extension)')" />
     </ItemGroup>
 
-    <MakeDir Directories="$(TempWorkingDirectory)" />
-
     <PushToBuildStorage
+      PublishFlatContainer="true"
       AzureDevOpsCollectionUri="$(SYSTEM_TEAMFOUNDATIONCOLLECTIONURI)"
       AzureDevOpsProject="$(SYSTEM_TEAMPROJECT)"
       AzureDevOpsBuildId="$(BUILD_BUILDID)"
       ItemsToPush="@(ToolsetAssetsToPushToBlobFeed)"
       ItemsToSign="@(ItemsToSignPostBuild)"
-      CertificatesSignInfo="@(CertificatesSignInfo)"
       StrongNameSignInfo="@(StrongNameSignInfo)"
+      CertificatesSignInfo="@(CertificatesSignInfo)"
       FileSignInfo="@(FileSignInfo)"
       FileExtensionSignInfo="@(FileExtensionSignInfo)"
       ManifestBuildData="@(ManifestBuildData)"
       ManifestRepoUri="$(BUILD_REPOSITORY_NAME)"
       ManifestBranch="$(BUILD_SOURCEBRANCH)"
       ManifestBuildId="$(BUILD_BUILDNUMBER)"
       ManifestCommit="$(BUILD_SOURCEVERSION)"
-      PublishFlatContainer="true"
-      AssetManifestPath="$(SdkAssetsManifestFilePath)"
-      AssetsTemporaryDirectory="$(TempWorkingDirectory)"
+      ManifestRepoOrigin="$(GitHubRepositoryName)"
       IsStableBuild="$(IsStableBuild)"
+      PublishingVersion="$(PublishingVersion)"
+      AssetManifestPath="$(SdkAssetsManifestFilePath)"
+      IsReleaseOnlyPackageVersion="$(IsReleaseOnlyPackageVersion)"
       PushToLocalStorage="$(PushToLocalStorage)"
       AssetsLocalStorageDir="$(SourceBuiltAssetsDir)"
       ShippingPackagesLocalStorageDir="$(SourceBuiltShippingPackagesDir)"
       NonShippingPackagesLocalStorageDir="$(SourceBuiltNonShippingPackagesDir)"
       AssetManifestsLocalStorageDir="$(SourceBuiltAssetManifestsDir)" />
-
-    <Copy SourceFiles="$(SdkAssetsManifestFilePath)" DestinationFolder="$(TempWorkingDirectory)\$(SdkAssetManifestFileName)" />
-
-    <Message Text="##vso[artifact.upload containerfolder=AssetManifests;artifactname=AssetManifests]$(TempWorkingDirectory)/$(SdkAssetManifestFileName)" Importance="high" />
   </Target>
 
   <PropertyGroup>
-      <!--
-        Because we may be building in a container, we should use an asset manifest file path that exists in the container. Disambiguate the manifests via available properties.
-        AGENT_OS and SYSTEM_PHASENAME are present on Azure DevOps agents. AssetManifestOS will also be used by arcade to generate the name of the manifest file name for the built in publishing.
-      -->
-      <AssetManifestOS Condition="'$(AGENT_OS)' != ''">$(AGENT_OS)</AssetManifestOS>
-      <AssetManifestOS Condition="'$(AGENT_OS)' == ''">$(OS)</AssetManifestOS>
-      <AssetManifestOS Condition="'$(SYSTEM_PHASENAME)' != ''">$(AssetManifestOS)-$(SYSTEM_PHASENAME)</AssetManifestOS>
-      <BaseAssetManifestFileName>$(AssetManifestOS)</BaseAssetManifestFileName>
-      <BaseAssetManifestFileName Condition="'$(SYSTEM_PHASENAME)' == '' and '$(Architecture)' != ''">$(AssetManifestOS)-$(Architecture)</BaseAssetManifestFileName>
-      <InstallersAssetManifestFileName>$(BaseAssetManifestFileName)-installers$(SdkAssetManifestBuildPass)</InstallersAssetManifestFileName>
-      <!-- Property AssetManifestFilePath would be reassigned by the Arcade SDK, so use a different name (InstallersAssetManifestFilePath) -->
-      <InstallersAssetManifestFilePath>$(ArtifactsLogDir)AssetManifest\$(InstallersAssetManifestFileName).xml</InstallersAssetManifestFilePath>
-
-      <DotnetTempWorkingDirectory>$(ArtifactsDir)..\DotnetAssetsTmpDir\$([System.Guid]::NewGuid())</DotnetTempWorkingDirectory>
-      <ChecksumTempWorkingDirectory>$(ArtifactsDir)..\ChecksumAssetsTmpDir\$([System.Guid]::NewGuid())</ChecksumTempWorkingDirectory>
+    <!--
+      Because we may be building in a container, we should use an asset manifest file path that exists in the container. Disambiguate the manifests via available properties.
+      AGENT_OS and SYSTEM_PHASENAME are present on Azure DevOps agents. AssetManifestOS will also be used by arcade to generate the name of the manifest file name for the built in publishing.
+    -->
+    <AssetManifestOS Condition="'$(AGENT_OS)' != ''">$(AGENT_OS)</AssetManifestOS>
+    <AssetManifestOS Condition="'$(AGENT_OS)' == ''">$(OS)</AssetManifestOS>
+    <AssetManifestOS Condition="'$(SYSTEM_PHASENAME)' != ''">$(AssetManifestOS)-$(SYSTEM_PHASENAME)</AssetManifestOS>
+    <BaseAssetManifestFileName>$(AssetManifestOS)</BaseAssetManifestFileName>
+    <BaseAssetManifestFileName Condition="'$(SYSTEM_PHASENAME)' == '' and '$(Architecture)' != ''">$(AssetManifestOS)-$(Architecture)</BaseAssetManifestFileName>
+    <InstallersAssetManifestFileName>$(BaseAssetManifestFileName)-installers$(SdkAssetManifestBuildPass)</InstallersAssetManifestFileName>
+    <!-- Property AssetManifestFilePath would be reassigned by the Arcade SDK, so use a different name (InstallersAssetManifestFilePath) -->
+    <InstallersAssetManifestFilePath>$(ArtifactsLogDir)AssetManifest\$(InstallersAssetManifestFileName).xml</InstallersAssetManifestFilePath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -222,23 +214,26 @@
     </ItemGroup>
 
     <PushToBuildStorage
+      PublishFlatContainer="true"
       AzureDevOpsCollectionUri="$(SYSTEM_TEAMFOUNDATIONCOLLECTIONURI)"
       AzureDevOpsProject="$(SYSTEM_TEAMPROJECT)"
       AzureDevOpsBuildId="$(BUILD_BUILDID)"
       ItemsToPush="@(SdkAssetsToPushToBlobFeed);@(ChecksumsToPushToBlobFeed)"
       ItemsToSign="@(ItemsToSignPostBuild)"
-      CertificatesSignInfo="@(CertificatesSignInfo)"
       StrongNameSignInfo="@(StrongNameSignInfo)"
+      CertificatesSignInfo="@(CertificatesSignInfo)"
       FileSignInfo="@(FileSignInfo)"
       FileExtensionSignInfo="@(FileExtensionSignInfo)"
       ManifestBuildData="@(ManifestBuildData)"
-      ManifestRepoName="$(BUILD_REPOSITORY_NAME)"
+      ManifestRepoUri="$(BUILD_REPOSITORY_NAME)"
       ManifestBranch="$(BUILD_SOURCEBRANCH)"
       ManifestBuildId="$(BUILD_BUILDNUMBER)"
       ManifestCommit="$(BUILD_SOURCEVERSION)"
-      AssetManifestPath="$(InstallersAssetManifestFilePath)"
-      PublishFlatContainer="true"
+      ManifestRepoOrigin="$(GitHubRepositoryName)"
       IsStableBuild="$(IsStableBuild)"
+      PublishingVersion="$(PublishingVersion)"
+      AssetManifestPath="$(InstallersAssetManifestFilePath)"
+      IsReleaseOnlyPackageVersion="$(IsReleaseOnlyPackageVersion)"
       PushToLocalStorage="$(PushToLocalStorage)"
       AssetsLocalStorageDir="$(SourceBuiltAssetsDir)"
       ShippingPackagesLocalStorageDir="$(SourceBuiltShippingPackagesDir)"