diff --git a/NuGet.config b/NuGet.config
index 847436d5141153..0a21a797a52ed1 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -9,6 +9,9 @@
+
+
+
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 4e3234e2896c7f..4cf93dda42e66a 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -26,77 +26,77 @@
-
+
https://github.com/dotnet/arcade
- 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c
+ e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2
-
+
https://github.com/dotnet/arcade
- 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c
+ e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2
-
+
https://github.com/dotnet/arcade
- 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c
+ e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2
-
+
https://github.com/dotnet/arcade
- 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c
+ e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2
-
+
https://github.com/dotnet/arcade
- 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c
+ e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2
-
+
https://github.com/dotnet/arcade
- 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c
+ e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2
-
+
https://github.com/dotnet/arcade
- 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c
+ e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2
-
+
https://github.com/dotnet/arcade
- 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c
+ e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2
-
+
https://github.com/dotnet/arcade
- 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c
+ e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2
-
+
https://github.com/dotnet/arcade
- 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c
+ e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2
-
+
https://github.com/dotnet/arcade
- 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c
+ e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2
-
+
https://github.com/dotnet/arcade
- 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c
+ e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2
-
+
https://github.com/dotnet/arcade
- 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c
+ e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2
-
+
https://github.com/dotnet/arcade
- 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c
+ e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2
-
+
https://github.com/dotnet/arcade
- 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c
+ e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2
-
+
https://github.com/dotnet/arcade
- 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c
+ e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2
-
+
https://github.com/dotnet/arcade
- 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c
+ e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2
-
+
https://github.com/dotnet/arcade
- 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c
+ e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2
https://github.com/microsoft/vstest
@@ -222,9 +222,9 @@
https://github.com/dotnet/xharness
dcd239f92887f600f75093d5ffff27b2dfeb034b
-
+
https://github.com/dotnet/arcade
- 7c67805da0adbf4e72f2f4799b63efcf1cc8fe4c
+ e5e9a01e6d0dcde2e945624bc1ba1bc05d2c1fc2
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
diff --git a/eng/Versions.props b/eng/Versions.props
index 95aff3dbb7102d..50b329e69f590e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -42,21 +42,21 @@
1.1.0-preview.22164.17
- 6.0.0-beta.23517.3
- 6.0.0-beta.23517.3
- 6.0.0-beta.23517.3
- 6.0.0-beta.23517.3
- 6.0.0-beta.23517.3
- 6.0.0-beta.23517.3
- 2.5.1-beta.23517.3
- 6.0.0-beta.23517.3
- 6.0.0-beta.23517.3
- 6.0.0-beta.23517.3
- 6.0.0-beta.23517.3
- 6.0.0-beta.23517.3
- 6.0.0-beta.23517.3
- 6.0.0-beta.23517.3
- 6.0.0-beta.23517.3
+ 6.0.0-beta.24059.3
+ 6.0.0-beta.24059.3
+ 6.0.0-beta.24059.3
+ 6.0.0-beta.24059.3
+ 6.0.0-beta.24059.3
+ 6.0.0-beta.24059.3
+ 2.5.1-beta.24059.3
+ 6.0.0-beta.24059.3
+ 6.0.0-beta.24059.3
+ 6.0.0-beta.24059.3
+ 6.0.0-beta.24059.3
+ 6.0.0-beta.24059.3
+ 6.0.0-beta.24059.3
+ 6.0.0-beta.24059.3
+ 6.0.0-beta.24059.3
6.0.0-preview.1.102
diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1
index 435e7641341b16..8fda30bdce2b09 100644
--- a/eng/common/darc-init.ps1
+++ b/eng/common/darc-init.ps1
@@ -1,6 +1,6 @@
param (
$darcVersion = $null,
- $versionEndpoint = 'https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16',
+ $versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16',
$verbosity = 'minimal',
$toolpath = $null
)
diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh
index 39abdbecdcf11b..4e4116f1d0bf9b 100755
--- a/eng/common/darc-init.sh
+++ b/eng/common/darc-init.sh
@@ -2,7 +2,7 @@
source="${BASH_SOURCE[0]}"
darcVersion=''
-versionEndpoint='https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16'
+versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16'
verbosity='minimal'
while [[ $# > 0 ]]; do
diff --git a/eng/common/post-build/add-build-to-channel.ps1 b/eng/common/post-build/add-build-to-channel.ps1
index de2d957922a653..49938f0c89f768 100644
--- a/eng/common/post-build/add-build-to-channel.ps1
+++ b/eng/common/post-build/add-build-to-channel.ps1
@@ -2,7 +2,7 @@ param(
[Parameter(Mandatory=$true)][int] $BuildId,
[Parameter(Mandatory=$true)][int] $ChannelId,
[Parameter(Mandatory=$true)][string] $MaestroApiAccessToken,
- [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com',
+ [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net',
[Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16'
)
diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1
index 8508397d77640e..1e779fec4dd1ea 100644
--- a/eng/common/post-build/publish-using-darc.ps1
+++ b/eng/common/post-build/publish-using-darc.ps1
@@ -3,7 +3,7 @@ param(
[Parameter(Mandatory=$true)][int] $PublishingInfraVersion,
[Parameter(Mandatory=$true)][string] $AzdoToken,
[Parameter(Mandatory=$true)][string] $MaestroToken,
- [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com',
+ [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net',
[Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
[Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
[Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters
diff --git a/eng/common/post-build/trigger-subscriptions.ps1 b/eng/common/post-build/trigger-subscriptions.ps1
index 55dea518ac5850..ac9a95778fcd9e 100644
--- a/eng/common/post-build/trigger-subscriptions.ps1
+++ b/eng/common/post-build/trigger-subscriptions.ps1
@@ -2,7 +2,7 @@ param(
[Parameter(Mandatory=$true)][string] $SourceRepo,
[Parameter(Mandatory=$true)][int] $ChannelId,
[Parameter(Mandatory=$true)][string] $MaestroApiAccessToken,
- [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro-prod.westus2.cloudapp.azure.com',
+ [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net',
[Parameter(Mandatory=$false)][string] $MaestroApiVersion = '2019-01-16'
)
diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml
index 0e10e7db69c77a..01da2420df6069 100644
--- a/eng/common/templates/job/job.yml
+++ b/eng/common/templates/job/job.yml
@@ -123,7 +123,7 @@ jobs:
continueOnError: ${{ parameters.continueOnError }}
condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
- - task: NuGetAuthenticate@0
+ - task: NuGetAuthenticate@1
- ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}:
- task: DownloadPipelineArtifact@2
diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml
index d91bf9147116f0..239b17010fa7eb 100644
--- a/eng/common/templates/job/publish-build-assets.yml
+++ b/eng/common/templates/job/publish-build-assets.yml
@@ -53,7 +53,7 @@ jobs:
continueOnError: ${{ parameters.continueOnError }}
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- - task: NuGetAuthenticate@0
+ - task: NuGetAuthenticate@1
- task: PowerShell@2
displayName: Enable cross-org NuGet feed authentication
@@ -68,7 +68,7 @@ jobs:
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
/p:BuildAssetRegistryToken=$(MaestroAccessToken)
- /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com
+ /p:MaestroApiEndpoint=https://maestro.dot.net
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
/p:Configuration=$(_BuildConfig)
/p:OfficialBuildId=$(Build.BuildNumber)
diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml
index 1ac7f49a43ca87..fae340f4d20d70 100644
--- a/eng/common/templates/post-build/common-variables.yml
+++ b/eng/common/templates/post-build/common-variables.yml
@@ -11,7 +11,7 @@ variables:
# Default Maestro++ API Endpoint and API Version
- name: MaestroApiEndPoint
- value: "https://maestro-prod.westus2.cloudapp.azure.com"
+ value: "https://maestro.dot.net"
- name: MaestroApiAccessToken
value: $(MaestroAccessToken)
- name: MaestroApiVersion
diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml
index fc022ca9b266a5..d49c6156bf0aa2 100644
--- a/eng/common/templates/post-build/post-build.yml
+++ b/eng/common/templates/post-build/post-build.yml
@@ -162,7 +162,7 @@ stages:
# This is necessary whenever we want to publish/restore to an AzDO private feed
# Since sdk-task.ps1 tries to restore packages we need to do this authentication here
# otherwise it'll complain about accessing a private feed.
- - task: NuGetAuthenticate@0
+ - task: NuGetAuthenticate@1
displayName: 'Authenticate to AzDO Feeds'
- task: PowerShell@2
diff --git a/global.json b/global.json
index 6a42f9d9539214..9f87ed8e140e07 100644
--- a/global.json
+++ b/global.json
@@ -1,21 +1,21 @@
{
"sdk": {
- "version": "6.0.123",
+ "version": "6.0.126",
"allowPrerelease": true,
"rollForward": "major"
},
"tools": {
- "dotnet": "6.0.123"
+ "dotnet": "6.0.126"
},
"native-tools": {
"cmake": "3.16.4",
"python3": "3.7.1"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.23517.3",
- "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23517.3",
- "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.23517.3",
- "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.23517.3",
+ "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.24059.3",
+ "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24059.3",
+ "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24059.3",
+ "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.24059.3",
"Microsoft.Build.NoTargets": "3.1.0",
"Microsoft.Build.Traversal": "3.0.23",
"Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6"