Skip to content

Revert Arcade update & Workload Manifest change #71110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-emsdk -->
<add key="darc-pub-dotnet-emsdk-52e9452" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-52e9452f/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-emsdk -->
<!-- Begin: Package sources from dotnet-wcf -->
<!-- End: Package sources from dotnet-wcf -->
Expand Down
108 changes: 54 additions & 54 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,77 +26,77 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22314.7">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.22161.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22314.7">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.22161.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22314.7">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.22161.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.22314.7">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.22161.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.22314.7">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.22161.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22314.7">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.22161.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22314.7">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22161.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.22314.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.22161.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.22314.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.22161.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22314.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.22161.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22314.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.22161.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.22314.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.22161.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.22314.7">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.22161.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.22314.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.22161.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.22314.7">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.22161.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.22314.7">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.22161.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.22314.7">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.22161.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.22314.7">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.22161.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
<Uri>https://github.com/microsoft/vstest</Uri>
Expand Down Expand Up @@ -142,37 +142,37 @@
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>6c6b7f90677142ad7bd829eb28d3bcf8ad775dd7</Sha>
</Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22316.1">
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.21416.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>0f10ab4748ab03f248985e664aea7ec9df55b3f4</Sha>
<Sha>cea4a95e1505e737e768c8094d6aa880f5442ab7</Sha>
</Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.22316.1">
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.21416.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>0f10ab4748ab03f248985e664aea7ec9df55b3f4</Sha>
<Sha>cea4a95e1505e737e768c8094d6aa880f5442ab7</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22316.1">
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.21416.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>0f10ab4748ab03f248985e664aea7ec9df55b3f4</Sha>
<Sha>cea4a95e1505e737e768c8094d6aa880f5442ab7</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.22316.1">
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.21416.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>0f10ab4748ab03f248985e664aea7ec9df55b3f4</Sha>
<Sha>cea4a95e1505e737e768c8094d6aa880f5442ab7</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22316.1">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.21416.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>0f10ab4748ab03f248985e664aea7ec9df55b3f4</Sha>
<Sha>cea4a95e1505e737e768c8094d6aa880f5442ab7</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.22316.1">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.21416.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>0f10ab4748ab03f248985e664aea7ec9df55b3f4</Sha>
<Sha>cea4a95e1505e737e768c8094d6aa880f5442ab7</Sha>
</Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.22316.1">
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.21416.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>0f10ab4748ab03f248985e664aea7ec9df55b3f4</Sha>
<Sha>cea4a95e1505e737e768c8094d6aa880f5442ab7</Sha>
</Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.22316.1">
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="11.1.0-alpha.1.21416.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>0f10ab4748ab03f248985e664aea7ec9df55b3f4</Sha>
<Sha>cea4a95e1505e737e768c8094d6aa880f5442ab7</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.0-rc.1.21415.6">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down Expand Up @@ -218,9 +218,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>e9669dc84ecd668d3bbb748758103e23b394ffef</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.22314.7">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.22161.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fdd3a242bc813f371023adff4e4c05c0be705d2a</Sha>
<Sha>879df783283dfb44c7653493fdf7fd7b07ba6b01</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21416.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
46 changes: 23 additions & 23 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -41,21 +41,21 @@
<!-- SDK dependencies -->
<MicrosoftDotNetCompatibilityVersion>1.1.0-preview.22164.17</MicrosoftDotNetCompatibilityVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.22314.7</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.22314.7</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.22314.7</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.22314.7</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.22314.7</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22314.7</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22314.7</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.22314.7</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22314.7</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22314.7</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22314.7</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.22314.7</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.22314.7</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.22314.7</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.22314.7</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.22161.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.22161.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.22161.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.22161.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.22161.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22161.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.22161.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.22161.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.22161.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.22161.1</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down Expand Up @@ -161,14 +161,14 @@
<!-- MsQuic -->
<SystemNetMsQuicTransportVersion>6.0.0-preview.7.21417.1</SystemNetMsQuicTransportVersion>
<!-- Mono LLVM -->
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22316.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22316.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22316.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22316.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22316.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22316.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.22316.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.22316.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21416.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21416.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21416.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21416.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21416.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21416.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21416.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21416.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<!-- emscripten / Node -->
<MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.4</MicrosoftNETWorkloadEmscriptenManifest60100Version>
<MicrosoftNETWorkloadEmscriptenManifest60200Version>6.0.4</MicrosoftNETWorkloadEmscriptenManifest60200Version>
Expand Down
4 changes: 2 additions & 2 deletions eng/common/templates/steps/source-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ steps:
# In that case, add variables to allow the download of internal runtimes if the specified versions are not found
# in the default public locations.
internalRuntimeDownloadArgs=
if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)'
if [ '$(dotnetclimsrc-read-sas-token-base64)' != '$''(dotnetclimsrc-read-sas-token-base64)' ]; then
internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetclimsrc.blob.core.windows.net/dotnet /p:DotNetRuntimeSourceFeedKey=$(dotnetclimsrc-read-sas-token-base64) --runtimesourcefeed https://dotnetclimsrc.blob.core.windows.net/dotnet --runtimesourcefeedkey $(dotnetclimsrc-read-sas-token-base64)'
fi

buildConfig=Release
Expand Down
8 changes: 4 additions & 4 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"python3": "3.7.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.22314.7",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22314.7",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22314.7",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.22314.7",
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.22161.1",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.22161.1",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.22161.1",
"Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.22161.1",
"Microsoft.Build.NoTargets": "3.1.0",
"Microsoft.Build.Traversal": "3.0.23",
"Microsoft.NET.Sdk.IL": "6.0.0-rc.1.21415.6"
Expand Down
Loading