diff --git a/NuGet.config b/NuGet.config index d8a964dd266..3dad1dfba26 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 4cbdef85513..cfa376baf63 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,9 +6,9 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.26270.134 - 10.0.0-beta.26270.134 - 10.0.0-beta.26270.134 + 10.0.0-beta.26272.117 + 10.0.0-beta.26272.117 + 10.0.0-beta.26272.117 10.0.9 10.0.9 10.0.9 @@ -16,10 +16,10 @@ This file should be imported by eng/Versions.props 10.0.9 10.0.9 10.0.9 - 10.0.9-servicing.26270.134 + 10.0.9-servicing.26272.117 10.0.9 10.0.9 - 10.0.9-servicing.26270.134 + 10.0.9-servicing.26272.117 10.0.9 10.0.9 10.0.9 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35eef39f907..c0d066eecd5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,80 +1,80 @@ - + https://github.com/dotnet/dotnet - f7a0202521a5bba40862d5999d43aedf45a65ab3 + d4d18f3a6b721b12a0589b26db5b9226f18447a1 https://github.com/dotnet/dotnet - f7a0202521a5bba40862d5999d43aedf45a65ab3 + d4d18f3a6b721b12a0589b26db5b9226f18447a1 https://github.com/dotnet/dotnet - f7a0202521a5bba40862d5999d43aedf45a65ab3 + d4d18f3a6b721b12a0589b26db5b9226f18447a1 https://github.com/dotnet/dotnet - f7a0202521a5bba40862d5999d43aedf45a65ab3 + d4d18f3a6b721b12a0589b26db5b9226f18447a1 https://github.com/dotnet/dotnet - f7a0202521a5bba40862d5999d43aedf45a65ab3 + d4d18f3a6b721b12a0589b26db5b9226f18447a1 https://github.com/dotnet/dotnet - f7a0202521a5bba40862d5999d43aedf45a65ab3 + d4d18f3a6b721b12a0589b26db5b9226f18447a1 https://github.com/dotnet/dotnet - f7a0202521a5bba40862d5999d43aedf45a65ab3 + d4d18f3a6b721b12a0589b26db5b9226f18447a1 - + https://github.com/dotnet/dotnet - f7a0202521a5bba40862d5999d43aedf45a65ab3 + d4d18f3a6b721b12a0589b26db5b9226f18447a1 https://github.com/dotnet/dotnet - f7a0202521a5bba40862d5999d43aedf45a65ab3 + d4d18f3a6b721b12a0589b26db5b9226f18447a1 https://github.com/dotnet/dotnet - f7a0202521a5bba40862d5999d43aedf45a65ab3 + d4d18f3a6b721b12a0589b26db5b9226f18447a1 - + https://github.com/dotnet/dotnet - f7a0202521a5bba40862d5999d43aedf45a65ab3 + d4d18f3a6b721b12a0589b26db5b9226f18447a1 https://github.com/dotnet/dotnet - f7a0202521a5bba40862d5999d43aedf45a65ab3 + d4d18f3a6b721b12a0589b26db5b9226f18447a1 https://github.com/dotnet/dotnet - f7a0202521a5bba40862d5999d43aedf45a65ab3 + d4d18f3a6b721b12a0589b26db5b9226f18447a1 https://github.com/dotnet/dotnet - f7a0202521a5bba40862d5999d43aedf45a65ab3 + d4d18f3a6b721b12a0589b26db5b9226f18447a1 https://github.com/dotnet/dotnet - f7a0202521a5bba40862d5999d43aedf45a65ab3 + d4d18f3a6b721b12a0589b26db5b9226f18447a1 - + https://github.com/dotnet/dotnet - f7a0202521a5bba40862d5999d43aedf45a65ab3 + d4d18f3a6b721b12a0589b26db5b9226f18447a1 - + https://github.com/dotnet/dotnet - f7a0202521a5bba40862d5999d43aedf45a65ab3 + d4d18f3a6b721b12a0589b26db5b9226f18447a1 - + https://github.com/dotnet/dotnet - f7a0202521a5bba40862d5999d43aedf45a65ab3 + d4d18f3a6b721b12a0589b26db5b9226f18447a1 diff --git a/eng/common/core-templates/steps/source-index-stage1-publish.yml b/eng/common/core-templates/steps/source-index-stage1-publish.yml index e9a694afa58..6e7666b4dcf 100644 --- a/eng/common/core-templates/steps/source-index-stage1-publish.yml +++ b/eng/common/core-templates/steps/source-index-stage1-publish.yml @@ -14,8 +14,8 @@ steps: workingDirectory: $(Agent.TempDirectory) - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools displayName: "Source Index: Download netsourceindex Tools" # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. workingDirectory: $(Agent.TempDirectory) diff --git a/eng/common/templates/steps/vmr-sync.yml b/eng/common/templates/steps/vmr-sync.yml index eb619c50268..cdc6a28ff1f 100644 --- a/eng/common/templates/steps/vmr-sync.yml +++ b/eng/common/templates/steps/vmr-sync.yml @@ -45,11 +45,11 @@ steps: workingDirectory: ${{ parameters.vmrPath }} - script: | - ./eng/common/vmr-sync.sh \ - --vmr ${{ parameters.vmrPath }} \ - --tmp $(Agent.TempDirectory) \ - --azdev-pat '$(dn-bot-all-orgs-code-r)' \ - --ci \ + ./eng/common/vmr-sync.sh \ + --vmr ${{ parameters.vmrPath }} \ + --tmp $(Agent.TempDirectory) \ + --azdev-pat '$(AzdoToken)' \ + --ci \ --debug if [ "$?" -ne 0 ]; then @@ -67,11 +67,11 @@ steps: condition: eq(variables['Agent.OS'], 'Windows_NT') - powershell: | - ./eng/common/vmr-sync.ps1 ` - -vmr ${{ parameters.vmrPath }} ` - -tmp $(Agent.TempDirectory) ` - -azdevPat '$(dn-bot-all-orgs-code-r)' ` - -ci ` + ./eng/common/vmr-sync.ps1 ` + -vmr ${{ parameters.vmrPath }} ` + -tmp $(Agent.TempDirectory) ` + -azdevPat '$(AzdoToken)' ` + -ci ` -debugOutput if ($LASTEXITCODE -ne 0) { diff --git a/global.json b/global.json index 30fa938ca00..f42884b9614 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26270.134", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26270.134" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26272.117", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26272.117" } }