diff options
| author | dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> | 2019-05-29 17:58:14 -0700 |
|---|---|---|
| committer | Juan Hoyos <juan.hoyos@microsoft.com> | 2019-05-29 17:58:14 -0700 |
| commit | 42ac1e71f77ab8e5036602b0bf673d6d6202923f (patch) | |
| tree | 05e8054f1478c6d5acecad55f48fecbeb00b7ebf /eng/common | |
| parent | c6824d52873d0f6382b4f733c50f510491d37b12 (diff) | |
| download | coreclr-42ac1e71f77ab8e5036602b0bf673d6d6202923f.tar.gz coreclr-42ac1e71f77ab8e5036602b0bf673d6d6202923f.tar.bz2 coreclr-42ac1e71f77ab8e5036602b0bf673d6d6202923f.zip | |
[master] Update dependencies from dotnet/arcade (#24780)
* Update dependencies from https://github.com/dotnet/arcade build 20190524.6
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19274.6
- Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19274.6
- Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19274.6
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19274.6
* Update dependencies from https://github.com/dotnet/arcade build 20190528.1
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19278.1
- Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19278.1
- Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19278.1
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19278.1
* Work around native initialization
Diffstat (limited to 'eng/common')
| -rw-r--r-- | eng/common/PublishToPackageFeed.proj | 1 | ||||
| -rwxr-xr-x | eng/common/build.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/eng/common/PublishToPackageFeed.proj b/eng/common/PublishToPackageFeed.proj index 9120b2d212..a1b1333723 100644 --- a/eng/common/PublishToPackageFeed.proj +++ b/eng/common/PublishToPackageFeed.proj @@ -54,6 +54,7 @@ <TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'WINDOWSDESKTOP'">https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json</TargetStaticFeed> <TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'NUGETCLIENT'">https://dotnetfeed.blob.core.windows.net/nuget-nugetclient/index.json</TargetStaticFeed> <TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'ASPNETENTITYFRAMEWORK6'">https://dotnetfeed.blob.core.windows.net/aspnet-entityframework6/index.json</TargetStaticFeed> + <TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == 'ASPNETBLAZOR'">https://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json</TargetStaticFeed> </PropertyGroup> <Error diff --git a/eng/common/build.sh b/eng/common/build.sh index 09eb4bf68f..8a8f969e40 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -210,7 +210,7 @@ if [[ -n "${useInstalledDotNetCli:-}" ]]; then fi # Workaround for https://github.com/dotnet/arcade/issues/2673 -# if [[ "$restore" == true && -z ${DisableNativeToolsetInstalls:-} ]]; then +# if [[ "$restore" == true && -z ${DisableNativeToolsetInstalls:-} ]]; # InitializeNativeTools # fi |