diff options
| author | dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> | 2019-04-15 11:09:39 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2019-04-15 11:09:39 -0700 |
| commit | 57e4cc1fca7ecef509574029a468fb252c3c87d6 (patch) | |
| tree | 62eb2ac5d4dd86b27734f4de8e7cc5f34f4f4ca3 | |
| parent | 086082f1d9b76959654342ed9c3a498bbf646115 (diff) | |
| download | coreclr-57e4cc1fca7ecef509574029a468fb252c3c87d6.tar.gz coreclr-57e4cc1fca7ecef509574029a468fb252c3c87d6.tar.bz2 coreclr-57e4cc1fca7ecef509574029a468fb252c3c87d6.zip | |
[master] Update dependencies from dotnet/arcade (#23977)
* Update dependencies from https://github.com/dotnet/arcade build 20190414.2
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19214.2
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19214.2
| -rw-r--r-- | eng/Version.Details.xml | 8 | ||||
| -rw-r--r-- | eng/common/internal/Tools.csproj | 8 | ||||
| -rw-r--r-- | global.json | 4 |
3 files changed, 12 insertions, 8 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bbc6e9af8c..c0b8a82e00 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ <ProductDependencies> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19212.2"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19214.2"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>9d0fd805448082c8d55e2434607b481bca70a146</Sha> + <Sha>bcf1186cb0db792906fd319ae49bdbc41f44f8ec</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19212.2"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19214.2"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>9d0fd805448082c8d55e2434607b481bca70a146</Sha> + <Sha>bcf1186cb0db792906fd319ae49bdbc41f44f8ec</Sha> </Dependency> <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-preview5.19214.16"> <Uri>https://github.com/dotnet/corefx</Uri> diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index 1a81ff906f..1a39a7ef3f 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -12,8 +12,12 @@ <PackageReference Include="Drop.App" Version="$(DropAppVersion)" ExcludeAssets="all" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'"/> </ItemGroup> <PropertyGroup> - <RestoreSources> - https://devdiv.pkgs.visualstudio.com/_packaging/8f470c7e-ac49-4afe-a6ee-cf784e438b93/nuget/v3/index.json; + <RestoreSources></RestoreSources> + <RestoreSources Condition="'$(UsingToolIbcOptimization)' == 'true'"> + https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json; + </RestoreSources> + <RestoreSources Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'"> + $(RestoreSources); https://devdiv.pkgs.visualstudio.com/_packaging/VS/nuget/v3/index.json; </RestoreSources> </PropertyGroup> diff --git a/global.json b/global.json index 8aba36f282..37dcfed959 100644 --- a/global.json +++ b/global.json @@ -7,7 +7,7 @@ "python": "2.7.15" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19212.2", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19212.2" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19214.2", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19214.2" } } |