Merge pull request #8210 from rainersigwald/exp/16.11-build

Build updates for 16.11
dotnet · Dec 2, 2022 · 744e12e · 744e12e
2 parents 9cb5d94 + 4a3a06f
commit 744e12e
Show file tree

Hide file tree

Showing 11 changed files with 125 additions and 55 deletions.
diff --git a/.vsts-dotnet.yml b/.vsts-dotnet.yml
@@ -231,7 +231,7 @@ stages:
       dependsOn:
         - Windows_NT
       pool:
-        vmImage: vs2017-win2016
+        vmImage: windows-latest
 
 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
   - template: eng\common\templates\post-build\post-build.yml

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.22276.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.22526.12">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>9c6a04ea1e79e9fcd4e60abd5d2c577075787f93</Sha>
+      <Sha>7fafb6feb8f17f5dac9e8930c37016d250032c55</Sha>
     </Dependency>
     <Dependency Name="NuGet.Build.Tasks" Version="5.9.1-rc.8">
       <Uri>https://github.com/nuget/nuget.client</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -2,7 +2,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>
-    <VersionPrefix>16.11.3</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
+    <VersionPrefix>16.11.3</VersionPrefix>
+    <DotNetFinalVersionKind>release</DotNetFinalVersionKind>
     <AssemblyVersion>15.1.0.0</AssemblyVersion>
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
     <DotNetUseShippingVersions>true</DotNetUseShippingVersions>

diff --git a/eng/common/build.ps1 b/eng/common/build.ps1
diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1
diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1
diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
diff --git a/global.json b/global.json
@@ -12,6 +12,6 @@
   },
   "msbuild-sdks": {
     "Microsoft.Build.CentralPackageVersions": "2.0.1",
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.22276.2"
+    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.22526.12"
   }
 }