Merge branch 'release/6.0.4xx' of https://github.com/dotnet/sdk into …

…merge/release/6.0.1xx-to-release/6.0.4xx
dotnet · Sep 13, 2024 · 283338e · 283338e
2 parents bdb19eb + c2a59ab
commit 283338e
Show file tree

Hide file tree

Showing 874 changed files with 36,378 additions and 7,651 deletions.
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -165,15 +165,18 @@ extends:
                 image: 1es-ubuntu-2004
                 os: linux
             ${{ if eq(variables['System.TeamProject'], 'public') }}:
-              helixTargetQueue: Ubuntu.1804.Amd64.Open
+              helixTargetQueue: Ubuntu.2004.Amd64.Open
             ${{ if ne(variables['System.TeamProject'], 'public') }}:
-              helixTargetQueue: Ubuntu.1804.Amd64
+              helixTargetQueue: Ubuntu.2004.Amd64
             variables:
             - name: _BuildConfig
               value: Release
             - name: _PublishArgs
               value: ''
             - name: _SignType
+              value: test
+            - name: _Test
+              value: -test
 
         - template: /eng/build.yml@self
           parameters:
@@ -193,6 +196,8 @@ extends:
               value: ''
             - name: _SignType
               value: test
+            - name: _Test
+              value: -test
 
       - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
         - template: /eng/common/templates-official/job/publish-build-assets.yml@self

diff --git a/.vsts-pr.yml b/.vsts-pr.yml
@@ -126,20 +126,21 @@ stages:
         pool:
           ${{ if eq(variables['System.TeamProject'], 'public') }}:
             name: NetCore-Svc-Public
-            demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.Open
+            demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.open
           ${{ if ne(variables['System.TeamProject'], 'public') }}:
             name: NetCore1ESPool-Svc-Internal
             demands: ImageOverride -equals Build.Ubuntu.2004.Amd64
         ${{ if eq(variables['System.TeamProject'], 'public') }}:
-          helixTargetQueue: Ubuntu.1804.Amd64.Open
+          helixTargetQueue: Ubuntu.2004.Amd64.Open
         ${{ if ne(variables['System.TeamProject'], 'public') }}:
-          helixTargetQueue: Ubuntu.1804.Amd64
+          helixTargetQueue: Ubuntu.2004.Amd64
         strategy:
           matrix:
             Build_Release:
               _BuildConfig: Release
               _PublishArgs: ''
               _SignType: test
+              _Test: -test
 
     - template: /eng/build-pr.yml
       parameters:
@@ -156,6 +157,7 @@ stages:
               _BuildConfig: Release
               _PublishArgs: ''
               _SignType: test
+              _Test: -test
 
   - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
     - template: /eng/common/templates/job/publish-build-assets.yml

diff --git a/NuGet.config b/NuGet.config
@@ -7,25 +7,25 @@
     <add key="darc-int-dotnet-aspnetcore-f0f9de5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-f0f9de56/nuget/v3/index.json" />
     <add key="darc-int-dotnet-aspnetcore-f0f9de5-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-f0f9de56-5/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
-    <!--  Begin: Package sources from dotnet-runtime -->
-    <add key="darc-int-dotnet-runtime-6c63698" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-6c636980/nuget/v3/index.json" />
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <add key="darc-pub-DotNet-msbuild-Trusted-85d7107" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-85d71072/nuget/v3/index.json" />
+    <add key="darc-pub-DotNet-msbuild-Trusted-a400405" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-a400405b/nuget/v3/index.json" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-roslyn-analyzers -->
     <!--  End: Package sources from dotnet-roslyn-analyzers -->
+    <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-6c63698" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-6c636980/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-int-dotnet-templating-2fdb78d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-2fdb78d3/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-templating-2fdb78d-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-2fdb78d3-9/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-templating-2fdb78d-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-2fdb78d3-8/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-templating-2fdb78d-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-2fdb78d3-7/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-templating-2fdb78d-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-2fdb78d3-6/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-templating-2fdb78d-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-2fdb78d3-5/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-templating-2fdb78d-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-2fdb78d3-4/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-templating-2fdb78d-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-2fdb78d3-3/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-templating-2fdb78d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-2fdb78d3-2/nuget/v3/index.json" />
-    <add key="darc-int-dotnet-templating-2fdb78d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-2fdb78d3-1/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-templating-8413a0d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-templating-8413a0d-9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-9/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-templating-8413a0d-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-8/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-templating-8413a0d-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-7/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-templating-8413a0d-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-6/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-templating-8413a0d-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-5/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-templating-8413a0d-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-4/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-templating-8413a0d-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-3/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-templating-8413a0d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-2/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-templating-8413a0d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-templating-8413a0df-1/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-db4e5a3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-db4e5a36/nuget/v3/index.json" />
@@ -47,33 +47,34 @@
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
     <add key="dotnet-tools-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json" />
     <add key="dotnet-libraries" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries/nuget/v3/index.json" />
+    <add key="dotnet-libraries-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-libraries-transport/nuget/v3/index.json" />
     <add key="vs-impl" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json" />
     <!-- Used for Rich Navigation indexing task -->
     <add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+    <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
+    <!--  End: Package sources from DotNet-msbuild-Trusted -->
+    <!--  Begin: Package sources from dotnet-templating -->
+    <add key="darc-int-dotnet-templating-8413a0d-1" value="true" />
+    <add key="darc-int-dotnet-templating-8413a0d-2" value="true" />
+    <add key="darc-int-dotnet-templating-8413a0d-3" value="true" />
+    <add key="darc-int-dotnet-templating-8413a0d-4" value="true" />
+    <add key="darc-int-dotnet-templating-8413a0d-5" value="true" />
+    <add key="darc-int-dotnet-templating-8413a0d-6" value="true" />
+    <add key="darc-int-dotnet-templating-8413a0d-7" value="true" />
+    <add key="darc-int-dotnet-templating-8413a0d-8" value="true" />
+    <add key="darc-int-dotnet-templating-8413a0d-9" value="true" />
+    <add key="darc-int-dotnet-templating-8413a0d" value="true" />
+    <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
     <add key="darc-int-dotnet-aspnetcore-f0f9de5-5" value="true" />
     <add key="darc-int-dotnet-aspnetcore-f0f9de5" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
-    <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-runtime -->
     <add key="darc-int-dotnet-runtime-6c63698" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
-    <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-int-dotnet-templating-2fdb78d-1" value="true" />
-    <add key="darc-int-dotnet-templating-2fdb78d-2" value="true" />
-    <add key="darc-int-dotnet-templating-2fdb78d-3" value="true" />
-    <add key="darc-int-dotnet-templating-2fdb78d-4" value="true" />
-    <add key="darc-int-dotnet-templating-2fdb78d-5" value="true" />
-    <add key="darc-int-dotnet-templating-2fdb78d-6" value="true" />
-    <add key="darc-int-dotnet-templating-2fdb78d-7" value="true" />
-    <add key="darc-int-dotnet-templating-2fdb78d-8" value="true" />
-    <add key="darc-int-dotnet-templating-2fdb78d-9" value="true" />
-    <add key="darc-int-dotnet-templating-2fdb78d" value="true" />
-    <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
     <add key="darc-int-dotnet-windowsdesktop-db4e5a3-1" value="true" />
     <add key="darc-int-dotnet-windowsdesktop-db4e5a3-2" value="true" />

diff --git a/eng/BuildConfiguration/build-configuration.json b/eng/BuildConfiguration/build-configuration.json
@@ -1,10 +1,10 @@
 {
-   "RetryCountLimit":1,
+   "RetryCountLimit":0,
    "RetryByPipeline":{
       "RetryStages":[
          {
             "StageName":"build"
          }
       ]
    }
-}
+}
diff --git a/eng/Publishing.props b/eng/Publishing.props
@@ -59,6 +59,26 @@
     </CreateProperty>
   </Target>
 
+  <!-- FSharp needs to push different packages to nuget.org depending on whether the SDK is preview or not,
+       To achieve this, we find the FSharp compiler package, then the stable or non-stable FSharp.Core and Compiler service
+       package contained within, depending on the stability switch of the SDK. The SDK then treats these packages as its own outputs,
+       whch means they get automatically pushed on release day. -->
+  <PropertyGroup>
+    <PublishDependsOnTargets>$(PublishDependsOnTargets);_ResolvePublishFSharpNuGetPackages</PublishDependsOnTargets>
+  </PropertyGroup>
+
+  <Target Name="_ResolvePublishFSharpNuGetPackages">
+    <PropertyGroup>
+        <FSharpCorePath Condition="'$(DotNetFinalVersionKind)'!='release'">Shipping</FSharpCorePath>
+        <FSharpCorePath Condition="'$(DotNetFinalVersionKind)'=='release'">Release</FSharpCorePath>
+    </PropertyGroup>
+    <ItemGroup>
+        <FSharpPackagesToPush Include="$(NuGetPackageRoot)\Microsoft.FSharp.Compiler\$(MicrosoftFSharpCompilerPackageVersion)\contentFiles\$(FSharpCorePath)\FSharp.Core.*.nupkg"/>
+        <FSharpPackagesToPush Include="$(NuGetPackageRoot)\Microsoft.FSharp.Compiler\$(MicrosoftFSharpCompilerPackageVersion)\contentFiles\$(FSharpCorePath)\FSharp.Compiler.Service.*.nupkg" />
+        <ItemsToPushToBlobFeed Include="@(FSharpPackagesToPush)" />
+    </ItemGroup>
+  </Target>
+
   <!-- We use a separate target to publish this to blob storage so that we can push this to
        a relative path inside the blob storage. -->
   <Target Name="PublishToolsetAssets" DependsOnTargets="ReadToolsetVersion" BeforeTargets="Publish">
@@ -73,6 +93,12 @@
       <ItemsToSignPostBuild Remove="@(ItemsToSignPostBuild)" />
       <ItemsToSignPostBuild Include="@(ToolsetAssetsToPublish->'%(Filename)%(Extension)')" />
     </ItemGroup>
+
+    <PropertyGroup>
+      <IsStableBuild>false</IsStableBuild>
+      <IsStableBuild Condition="'$(DotNetFinalVersionKind)' == 'release'">true</IsStableBuild>
+    </PropertyGroup>
+
 
     <MakeDir Directories="$(TempWorkingDirectory)"/>
 
@@ -94,7 +120,8 @@
       PublishFlatContainer="true"
       AssetManifestPath="$(SdkAssetsManifestFilePath)"
       AssetsTemporaryDirectory="$(TempWorkingDirectory)" 
-      PublishingVersion="3"/>
+      PublishingVersion="3"
+      IsStableBuild="$(IsStableBuild)" />
 
     <Copy
       SourceFiles="$(SdkAssetsManifestFilePath)"