diff --git a/NuGet.config b/NuGet.config
index d77971e4e05b10..faad7955d1ce5c 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -10,14 +10,7 @@
-
-
-
-
-
-
-
-
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a18cf63ebb8954..56a4a8e4fc0373 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -111,9 +111,9 @@
-
+
https://github.com/dotnet/arcade
- c255aae7f2b128fa20a4441f0e192c3c53561621
+ 221fba21fbd6a29f17af7a7004f8ef18a51519bd
@@ -121,69 +121,69 @@
73f0850939d96131c28cf6ea6ee5aacb4da0083a
-
+
https://github.com/dotnet/arcade
- c255aae7f2b128fa20a4441f0e192c3c53561621
+ 221fba21fbd6a29f17af7a7004f8ef18a51519bd
-
+
https://github.com/dotnet/arcade
- c255aae7f2b128fa20a4441f0e192c3c53561621
+ 221fba21fbd6a29f17af7a7004f8ef18a51519bd
-
+
https://github.com/dotnet/arcade
- c255aae7f2b128fa20a4441f0e192c3c53561621
+ 221fba21fbd6a29f17af7a7004f8ef18a51519bd
-
+
https://github.com/dotnet/arcade
- c255aae7f2b128fa20a4441f0e192c3c53561621
+ 221fba21fbd6a29f17af7a7004f8ef18a51519bd
-
+
https://github.com/dotnet/arcade
- c255aae7f2b128fa20a4441f0e192c3c53561621
+ 221fba21fbd6a29f17af7a7004f8ef18a51519bd
-
+
https://github.com/dotnet/arcade
- c255aae7f2b128fa20a4441f0e192c3c53561621
+ 221fba21fbd6a29f17af7a7004f8ef18a51519bd
-
+
https://github.com/dotnet/arcade
- c255aae7f2b128fa20a4441f0e192c3c53561621
+ 221fba21fbd6a29f17af7a7004f8ef18a51519bd
-
+
https://github.com/dotnet/arcade
- c255aae7f2b128fa20a4441f0e192c3c53561621
+ 221fba21fbd6a29f17af7a7004f8ef18a51519bd
-
+
https://github.com/dotnet/arcade
- c255aae7f2b128fa20a4441f0e192c3c53561621
+ 221fba21fbd6a29f17af7a7004f8ef18a51519bd
-
+
https://github.com/dotnet/arcade
- c255aae7f2b128fa20a4441f0e192c3c53561621
+ 221fba21fbd6a29f17af7a7004f8ef18a51519bd
-
+
https://github.com/dotnet/arcade
- c255aae7f2b128fa20a4441f0e192c3c53561621
+ 221fba21fbd6a29f17af7a7004f8ef18a51519bd
-
+
https://github.com/dotnet/arcade
- c255aae7f2b128fa20a4441f0e192c3c53561621
+ 221fba21fbd6a29f17af7a7004f8ef18a51519bd
-
+
https://github.com/dotnet/arcade
- c255aae7f2b128fa20a4441f0e192c3c53561621
+ 221fba21fbd6a29f17af7a7004f8ef18a51519bd
-
+
https://github.com/dotnet/arcade
- c255aae7f2b128fa20a4441f0e192c3c53561621
+ 221fba21fbd6a29f17af7a7004f8ef18a51519bd
-
+
https://github.com/dotnet/arcade
- c255aae7f2b128fa20a4441f0e192c3c53561621
+ 221fba21fbd6a29f17af7a7004f8ef18a51519bd
-
+
https://github.com/dotnet/arcade
- c255aae7f2b128fa20a4441f0e192c3c53561621
+ 221fba21fbd6a29f17af7a7004f8ef18a51519bd
https://github.com/dotnet/runtime-assets
@@ -334,9 +334,9 @@
https://github.com/dotnet/xharness
3ba447103e5b0a23bbe544d6c3701f0fc64d2cfe
-
+
https://github.com/dotnet/arcade
- c255aae7f2b128fa20a4441f0e192c3c53561621
+ 221fba21fbd6a29f17af7a7004f8ef18a51519bd
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
diff --git a/eng/Versions.props b/eng/Versions.props
index 968e942fd774eb..09243d89248f88 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -87,21 +87,21 @@
8.0.100
- 8.0.0-beta.25060.1
- 8.0.0-beta.25060.1
- 8.0.0-beta.25060.1
- 8.0.0-beta.25060.1
- 8.0.0-beta.25060.1
- 2.5.1-beta.25060.1
- 8.0.0-beta.25060.1
- 8.0.0-beta.25060.1
- 8.0.0-beta.25060.1
- 8.0.0-beta.25060.1
- 8.0.0-beta.25060.1
- 8.0.0-beta.25060.1
- 8.0.0-beta.25060.1
- 8.0.0-beta.25060.1
- 8.0.0-beta.25060.1
+ 8.0.0-beta.25114.5
+ 8.0.0-beta.25114.5
+ 8.0.0-beta.25114.5
+ 8.0.0-beta.25114.5
+ 8.0.0-beta.25114.5
+ 2.5.1-beta.25114.5
+ 8.0.0-beta.25114.5
+ 8.0.0-beta.25114.5
+ 8.0.0-beta.25114.5
+ 8.0.0-beta.25114.5
+ 8.0.0-beta.25114.5
+ 8.0.0-beta.25114.5
+ 8.0.0-beta.25114.5
+ 8.0.0-beta.25114.5
+ 8.0.0-beta.25114.5
6.0.0-preview.1.102
diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1
index 73828dd30d3179..4f0546dce1208d 100644
--- a/eng/common/sdk-task.ps1
+++ b/eng/common/sdk-task.ps1
@@ -64,7 +64,7 @@ try {
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
}
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
- $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.1-2" -MemberType NoteProperty
+ $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
}
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
diff --git a/eng/common/templates-official/steps/send-to-helix.yml b/eng/common/templates-official/steps/send-to-helix.yml
index 3eb7e2d5f840c7..22f2501307d4ba 100644
--- a/eng/common/templates-official/steps/send-to-helix.yml
+++ b/eng/common/templates-official/steps/send-to-helix.yml
@@ -8,6 +8,7 @@ parameters:
HelixConfiguration: '' # optional -- additional property attached to a job
HelixPreCommands: '' # optional -- commands to run before Helix work item execution
HelixPostCommands: '' # optional -- commands to run after Helix work item execution
+ HelixProjectArguments: '' # optional -- arguments passed to the build command for helixpublish.proj
WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects
WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects
WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects
@@ -24,12 +25,12 @@ parameters:
IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set
HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net )
Creator: '' # optional -- if the build is external, use this to specify who is sending the job
- DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO
+ DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO
condition: succeeded() # optional -- condition for step to execute; defaults to succeeded()
continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false
steps:
- - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
+ - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
displayName: ${{ parameters.DisplayNamePrefix }} (Windows)
env:
BuildConfig: $(_BuildConfig)
@@ -59,7 +60,7 @@ steps:
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT'))
continueOnError: ${{ parameters.continueOnError }}
- - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
+ - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
displayName: ${{ parameters.DisplayNamePrefix }} (Unix)
env:
BuildConfig: $(_BuildConfig)
diff --git a/eng/common/templates/steps/send-to-helix.yml b/eng/common/templates/steps/send-to-helix.yml
index 3eb7e2d5f840c7..22f2501307d4ba 100644
--- a/eng/common/templates/steps/send-to-helix.yml
+++ b/eng/common/templates/steps/send-to-helix.yml
@@ -8,6 +8,7 @@ parameters:
HelixConfiguration: '' # optional -- additional property attached to a job
HelixPreCommands: '' # optional -- commands to run before Helix work item execution
HelixPostCommands: '' # optional -- commands to run after Helix work item execution
+ HelixProjectArguments: '' # optional -- arguments passed to the build command for helixpublish.proj
WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects
WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects
WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects
@@ -24,12 +25,12 @@ parameters:
IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set
HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net )
Creator: '' # optional -- if the build is external, use this to specify who is sending the job
- DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO
+ DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO
condition: succeeded() # optional -- condition for step to execute; defaults to succeeded()
continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false
steps:
- - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
+ - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"'
displayName: ${{ parameters.DisplayNamePrefix }} (Windows)
env:
BuildConfig: $(_BuildConfig)
@@ -59,7 +60,7 @@ steps:
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT'))
continueOnError: ${{ parameters.continueOnError }}
- - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
+ - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog
displayName: ${{ parameters.DisplayNamePrefix }} (Unix)
env:
BuildConfig: $(_BuildConfig)
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 60352ede194ec3..a00577ed17aa44 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -384,8 +384,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
# If the version of msbuild is going to be xcopied,
# use this version. Version matches a package here:
- # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.1-2
- $defaultXCopyMSBuildVersion = '17.8.1-2'
+ # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.12.0
+ $defaultXCopyMSBuildVersion = '17.12.0'
if (!$vsRequirements) {
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {
diff --git a/global.json b/global.json
index 6abaf940387f48..50ee710d83fdc4 100644
--- a/global.json
+++ b/global.json
@@ -1,16 +1,16 @@
{
"sdk": {
- "version": "8.0.110",
+ "version": "8.0.113",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
- "dotnet": "8.0.110"
+ "dotnet": "8.0.113"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25060.1",
- "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25060.1",
- "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25060.1",
+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25114.5",
+ "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25114.5",
+ "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25114.5",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"