diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 513e7c245d1ca7..36134b4ae9133a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,12 +1,12 @@ - + https://github.com/dotnet/icu - 5263e5a05ff3f9ba6cb061a97be83f5d8ad276be + 05dbba88d0ae799b4fea1e13c69b0c02beb7dcbe - + https://github.com/dotnet/msquic - 73d128a9c0beb6d6d92ef2b0c09ada8433754a11 + 362df5b138c53d034a5068fa9ea6c7ec8a632239 https://github.com/dotnet/emsdk @@ -14,149 +14,149 @@ - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 https://github.com/microsoft/vstest 140434f7109d357d0158ade9e5164a4861513965 - + https://github.com/dotnet/runtime-assets - cc70e46d909f35a576abe245219c1df31160bbd6 + 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 - + https://github.com/dotnet/runtime-assets - cc70e46d909f35a576abe245219c1df31160bbd6 + 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 - + https://github.com/dotnet/runtime-assets - cc70e46d909f35a576abe245219c1df31160bbd6 + 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 - + https://github.com/dotnet/runtime-assets - cc70e46d909f35a576abe245219c1df31160bbd6 + 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 - + https://github.com/dotnet/runtime-assets - cc70e46d909f35a576abe245219c1df31160bbd6 + 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 - + https://github.com/dotnet/runtime-assets - cc70e46d909f35a576abe245219c1df31160bbd6 + 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 - + https://github.com/dotnet/runtime-assets - cc70e46d909f35a576abe245219c1df31160bbd6 + 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 - + https://github.com/dotnet/runtime-assets - cc70e46d909f35a576abe245219c1df31160bbd6 + 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 - + https://github.com/dotnet/runtime-assets - cc70e46d909f35a576abe245219c1df31160bbd6 + 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 - + https://github.com/dotnet/runtime-assets - cc70e46d909f35a576abe245219c1df31160bbd6 + 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 - + https://github.com/dotnet/llvm-project - 30296e71234ffb3eb8da789d36adf4db146e6602 + cea4a95e1505e737e768c8094d6aa880f5442ab7 - + https://github.com/dotnet/llvm-project - 30296e71234ffb3eb8da789d36adf4db146e6602 + cea4a95e1505e737e768c8094d6aa880f5442ab7 - + https://github.com/dotnet/llvm-project - 30296e71234ffb3eb8da789d36adf4db146e6602 + cea4a95e1505e737e768c8094d6aa880f5442ab7 - + https://github.com/dotnet/llvm-project - 30296e71234ffb3eb8da789d36adf4db146e6602 + cea4a95e1505e737e768c8094d6aa880f5442ab7 - + https://github.com/dotnet/llvm-project - 30296e71234ffb3eb8da789d36adf4db146e6602 + cea4a95e1505e737e768c8094d6aa880f5442ab7 - + https://github.com/dotnet/llvm-project - 30296e71234ffb3eb8da789d36adf4db146e6602 + cea4a95e1505e737e768c8094d6aa880f5442ab7 - + https://github.com/dotnet/llvm-project - 30296e71234ffb3eb8da789d36adf4db146e6602 + cea4a95e1505e737e768c8094d6aa880f5442ab7 - + https://github.com/dotnet/llvm-project - 30296e71234ffb3eb8da789d36adf4db146e6602 + cea4a95e1505e737e768c8094d6aa880f5442ab7 https://github.com/dotnet/runtime @@ -202,33 +202,33 @@ https://github.com/dotnet/xharness e9669dc84ecd668d3bbb748758103e23b394ffef - + https://github.com/dotnet/arcade - 58ac7035021bd7277ef7582338afd25403fc9aea + 9b7027ba718462aa6410cef61a8be5a4283e7528 - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 59848b44e07f0c06bb2f00f93f033ee693029d1e + d50065944d8b41d804448a7056351481d583ad3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 59848b44e07f0c06bb2f00f93f033ee693029d1e + d50065944d8b41d804448a7056351481d583ad3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 59848b44e07f0c06bb2f00f93f033ee693029d1e + d50065944d8b41d804448a7056351481d583ad3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-optimization - 59848b44e07f0c06bb2f00f93f033ee693029d1e + d50065944d8b41d804448a7056351481d583ad3d https://github.com/dotnet/hotreload-utils 802e79f0cf423249d54bfaafca2da4a272f4ca07 - + https://github.com/dotnet/runtime-assets - cc70e46d909f35a576abe245219c1df31160bbd6 + 7f980667ff908c5b5d7cf0dd66d48e7af23daae1 https://github.com/dotnet/roslyn-analyzers diff --git a/eng/Versions.props b/eng/Versions.props index 626a8ec22b3d92..999c049d68c48c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,20 +54,20 @@ 1.0.0-rc.1.21404.21 - 6.0.0-beta.21412.1 - 6.0.0-beta.21412.1 - 6.0.0-beta.21412.1 - 6.0.0-beta.21412.1 - 6.0.0-beta.21412.1 - 6.0.0-beta.21412.1 - 2.5.1-beta.21412.1 - 6.0.0-beta.21412.1 - 6.0.0-beta.21412.1 - 6.0.0-beta.21412.1 - 6.0.0-beta.21412.1 - 6.0.0-beta.21412.1 - 6.0.0-beta.21412.1 - 6.0.0-beta.21412.1 + 6.0.0-beta.21413.4 + 6.0.0-beta.21413.4 + 6.0.0-beta.21413.4 + 6.0.0-beta.21413.4 + 6.0.0-beta.21413.4 + 6.0.0-beta.21413.4 + 2.5.1-beta.21413.4 + 6.0.0-beta.21413.4 + 6.0.0-beta.21413.4 + 6.0.0-beta.21413.4 + 6.0.0-beta.21413.4 + 6.0.0-beta.21413.4 + 6.0.0-beta.21413.4 + 6.0.0-beta.21413.4 6.0.0-preview.1.102 @@ -116,22 +116,22 @@ 4.5.0 6.0.0-rc.1.21415.6 - 6.0.0-beta.21411.3 - 6.0.0-beta.21411.3 - 6.0.0-beta.21411.3 - 6.0.0-beta.21411.3 - 6.0.0-beta.21411.3 - 6.0.0-beta.21411.3 - 6.0.0-beta.21411.3 - 6.0.0-beta.21411.3 - 6.0.0-beta.21411.3 - 6.0.0-beta.21411.3 - 6.0.0-beta.21411.3 + 6.0.0-beta.21416.1 + 6.0.0-beta.21416.1 + 6.0.0-beta.21416.1 + 6.0.0-beta.21416.1 + 6.0.0-beta.21416.1 + 6.0.0-beta.21416.1 + 6.0.0-beta.21416.1 + 6.0.0-beta.21416.1 + 6.0.0-beta.21416.1 + 6.0.0-beta.21416.1 + 6.0.0-beta.21416.1 - 1.0.0-prerelease.21411.3 - 1.0.0-prerelease.21411.3 - 1.0.0-prerelease.21411.3 - 1.0.0-prerelease.21411.3 + 1.0.0-prerelease.21416.5 + 1.0.0-prerelease.21416.5 + 1.0.0-prerelease.21416.5 + 1.0.0-prerelease.21416.5 16.9.0-beta1.21055.5 2.0.0-beta1.20253.1 @@ -172,18 +172,18 @@ 6.0.100-preview.6.21413.1 $(MicrosoftNETILLinkTasksVersion) - 6.0.0-rc.1.21410.2 + 6.0.0-rc.1.21416.1 - 6.0.0-preview.7.21413.1 + 6.0.0-preview.7.21416.1 - 11.1.0-alpha.1.21409.1 - 11.1.0-alpha.1.21409.1 - 11.1.0-alpha.1.21409.1 - 11.1.0-alpha.1.21409.1 - 11.1.0-alpha.1.21409.1 - 11.1.0-alpha.1.21409.1 - 11.1.0-alpha.1.21409.1 - 11.1.0-alpha.1.21409.1 + 11.1.0-alpha.1.21416.1 + 11.1.0-alpha.1.21416.1 + 11.1.0-alpha.1.21416.1 + 11.1.0-alpha.1.21416.1 + 11.1.0-alpha.1.21416.1 + 11.1.0-alpha.1.21416.1 + 11.1.0-alpha.1.21416.1 + 11.1.0-alpha.1.21416.1 6.0.0-rc.1.21416.1 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 21fba5fa40c3d3..b58d42364b9e77 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -35,15 +35,20 @@ jobs: packageType: sdk version: 3.1.x - - script: ${{ parameters.sourceIndexBuildCommand }} - displayName: Build Repository - + - task: UseDotNet@2 + displayName: Use .NET Core sdk + inputs: + useGlobalJson: true + - script: | dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools echo ##vso[task.prependpath]$(Build.SourcesDirectory)/.source-index/tools displayName: Download Tools + - script: ${{ parameters.sourceIndexBuildCommand }} + displayName: Build Repository + - script: BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output displayName: Process Binlog into indexable sln env: diff --git a/global.json b/global.json index b8af8d2dac2ad8..e3425ab9bdd9de 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21412.1", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21412.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21412.1", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21412.1", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21413.4", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21413.4", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21413.4", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21413.4", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6"