mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge remote-tracking branch 'upstream/release/3.0.1xx' into merges/release/3.0.1xx-to-master

Browse source 
* upstream/release/3.0.1xx: (109 commits)
  Updating the implicit 1.0/1.1 runtime versions for self-contained apps.
  Update dependencies from https://github.com/dotnet/toolset build 20190312.2
  Update dependencies from https://github.com/dotnet/toolset build 20190312.1
  Update dependencies from https://github.com/dotnet/toolset build 20190311.5
  Update dependencies from https://github.com/dotnet/toolset build 20190311.4
  Update dependencies from https://devdiv.visualstudio.com/DevDiv/_git/DotNet-Trusted build 20190311.38
  [release/3.0.1xx] Update dependencies from dotnet/toolset (#974)
  [release/3.0.1xx] Update dependencies from  1 repositories (#973)
  Update dependencies from https://github.com/dotnet/toolset build 20190311.1 (#972)
  [release/3.0.1xx] Update dependencies from  1 repositories (#926)
  Update dependencies from https://github.com/dotnet/standard build 20190308.1 (#939)
  Update dependencies from https://github.com/dotnet/core-setup build 20190309.01 (#935)
  [release/3.0.1xx] Update dependencies from dotnet/core-setup (#933)
  Update dependencies from https://github.com/dotnet/toolset build 20190308.9 (#930)
  Update dependencies from https://github.com/dotnet/toolset build 20190308.7 (#929)
  Update dependencies from https://github.com/dotnet/toolset build 20190308.8 (#928)
  Update dependencies from https://github.com/dotnet/toolset build 20190308.6 (#925)
  [release/3.0.1xx] Update dependencies from  1 repositories (#918)
  Update dependencies from https://github.com/dotnet/core-setup build 20190308.09 (#924)
  Update dependencies from https://github.com/dotnet/toolset build 20190308.5 (#921)
  ...

Conflicts:
eng/Version.Details.xml
eng/Versions.props
eng/common/generate-graph-files.ps1
global.json
src/redist/targets/GenerateBundledVersions.targets
This commit is contained in:
Livar Cunha 2019-03-12 12:35:50 -07:00
commit 28f32808f8
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
eng/Versions.props
View file

@ -80,6 +80,7 @@
https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json;
https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json;
https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json;
https://dotnetfeed.blob.core.windows.net/dotnet-toolset/index.json;
</RestoreSources>
</PropertyGroup>
</Project>

3
src/redist/targets/GenerateLayout.targets
View file

@ -10,6 +10,7 @@
<SdkOutputDirectory>$(RedistLayoutPath)sdk\$(SdkVersion)\</SdkOutputDirectory>
<CoreSetupBlobRootUrl>https://dotnetcli.azureedge.net/dotnet/</CoreSetupBlobRootUrl>
<DotnetExtensionsBlobRootUrl Condition="'$(DotnetExtensionsBlobRootUrl)' == ''">https://dotnetcli.blob.core.windows.net/dotnet/</DotnetExtensionsBlobRootUrl>
<DotnetToolsetBlobRootUrl Condition="'$(DotnetToolsetBlobRootUrl)' == ''">https://dotnetfeed.blob.core.windows.net/dotnet-toolset/</DotnetToolsetBlobRootUrl>
<CoreSetupRid>$(HostRid)</CoreSetupRid>
<CoreSetupRid Condition=" ('$(HostOSName)' == 'win' or '$(HostOSName)' == 'osx' or '$(HostOSName)' == 'freebsd') and '$(DotNetBuildFromSource)' != 'true' ">$(HostMonikerRid)</CoreSetupRid>
@ -139,7 +140,7 @@
</BundledInstallerComponent>
<BundledLayoutComponent Include="ToolsetArchive">
<BaseUrl>$(CoreSetupBlobRootUrl)Toolset/$(MicrosoftDotnetToolsetInternalPackageVersion)</BaseUrl>
<BaseUrl>$(DotnetToolsetBlobRootUrl)Toolset/$(MicrosoftDotnetToolsetInternalPackageVersion)</BaseUrl>
<DownloadFileName>dotnet-toolset-internal-$(MicrosoftDotnetToolsetInternalPackageVersion).zip</DownloadFileName>
<AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
<RelativeLayoutPath>sdk/$(SdkVersion)</RelativeLayoutPath>