Skip to content

Commit

Permalink
[release/3.0.100-preview9] Update dependencies from dotnet/toolset (#…
Browse files Browse the repository at this point in the history 
…4598)

* Update dependencies from https://github.com/dotnet/toolset build 20190905.26

- Microsoft.Dotnet.Toolset.Internal - 3.0.100-preview9.19455.26

Dependency coherency updates

- Microsoft.NET.Sdk - 3.0.100-preview9.19426.11 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-preview9.19426.10 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20190905.32

- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19455.32

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19455.1 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20190905.41

- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19455.41

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19455.1 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20190906.20

- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19456.20

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19455.1 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20190906.23

- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19456.23

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19456.11 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20190906.24

- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19456.24

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19456.11 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20190906.25

- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19456.25

Dependency coherency updates

- Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19456.11 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20190906.26

- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19456.26

Dependency coherency updates

- Microsoft.NET.Sdk - 3.0.100-rc1.19456.2 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19456.11 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20190906.27

- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19456.27

Dependency coherency updates

- Microsoft.NET.Sdk - 3.0.100-rc1.19456.2 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19456.12 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20190906.31

- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19456.31

Dependency coherency updates

- Microsoft.NET.Sdk - 3.0.100-rc1.19456.2 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19456.12 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20190907.21

- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19457.21

Dependency coherency updates

- Microsoft.NET.Sdk - 3.0.100-rc1.19456.2 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19456.12 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20190907.23

- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19457.23

Dependency coherency updates

- Microsoft.NET.Sdk - 3.0.100-rc1.19456.2 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19456.12 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20190907.24

- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19457.24

Dependency coherency updates

- Microsoft.NET.Sdk - 3.0.100-rc1.19456.2 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19457.9 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20190907.26

- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19457.26

Dependency coherency updates

- Microsoft.NET.Sdk - 3.0.100-rc1.19456.2 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19457.9 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20190907.27

- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19457.27

Dependency coherency updates

- Microsoft.NET.Sdk - 3.0.100-rc1.19456.2 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19457.11 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20190907.30

- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19457.30

Dependency coherency updates

- Microsoft.NET.Sdk - 3.0.100-rc1.19456.2 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19457.12 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20190908.1

- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19458.1

Dependency coherency updates

- Microsoft.NET.Sdk - 3.0.100-rc1.19456.2 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19457.12 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20190908.3

- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19458.3

Dependency coherency updates

- Microsoft.NET.Sdk - 3.0.100-rc1.19456.2 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19458.2 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update where we pull the toolset from

* Update dependencies from https://github.com/dotnet/toolset build 20190908.12

- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19458.12

Dependency coherency updates

- Microsoft.NET.Sdk - 3.0.100-rc1.19458.1 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19458.2 (parent: Microsoft.Dotnet.Toolset.Internal)

* Update dependencies from https://github.com/dotnet/toolset build 20190908.14

- Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc1.19458.14

Dependency coherency updates

- Microsoft.NET.Sdk - 3.0.100-rc1.19458.1 (parent: Microsoft.Dotnet.Toolset.Internal)
- Microsoft.DotNet.MSBuildSdkResolver - 3.0.100-rc1.19458.6 (parent: Microsoft.Dotnet.Toolset.Internal)
  • Loading branch information
@dotnet-maestro @mmitche
dotnet-maestro[bot] authored and mmitche committed Sep 9, 2019
1 parent d279f60 commit c4d43f6
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,17 @@
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>e8d6da33000a416b2b36b4f04b1756dcc99f671d</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-rc1.19455.2">
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-rc1.19458.14">
<Uri>https://github.com/dotnet/toolset</Uri>
<Sha>0006e3e685090a98024a0060c05164e71fbbd148</Sha>
<Sha>8d4c190fe5f865f9f900ac3a94a9e5b5029cdc03</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-rc1.19453.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-rc1.19458.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>59e63b28d24a769652b754f341d38c9de7c3d0d1</Sha>
<Sha>b09faf073550a3bf31f3be23ad0b2b7b4d80f4d5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.100-rc1.19454.5" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.100-rc1.19458.6" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
<Uri>https://github.com/dotnet/cli</Uri>
<Sha>a408b580b491bb17f444034bdda51e0986873bd1</Sha>
<Sha>70cf7521b833e92afe13864c775399a2e6922176</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via core setup -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.0-rc1.19455.20" CoherentParentDependency="Microsoft.WindowsDesktop.App">
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
</PropertyGroup>
<PropertyGroup>
<MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-rc1.19455.2</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-rc1.19458.14</MicrosoftDotnetToolsetInternalPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
Expand All @@ -33,14 +33,14 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/cli -->
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.100-rc1.19454.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.100-rc1.19458.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk (to run tests) -->
<MicrosoftNETSdkPackageVersion>3.0.100-rc1.19453.1</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>3.0.100-rc1.19458.1</MicrosoftNETSdkPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/redist/targets/GenerateLayout.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<SdkOutputDirectory>$(RedistLayoutPath)sdk\$(SdkVersion)\</SdkOutputDirectory>
<CoreSetupBlobRootUrl Condition="'$(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>
<DotnetToolsetBlobRootUrl Condition="'$(DotnetToolsetBlobRootUrl)' == ''">https://dotnetfeed.blob.core.windows.net/dotnet-core/</DotnetToolsetBlobRootUrl>

<CoreSetupRid Condition="'$(CoreSetupRid)' == ''">$(HostRid)</CoreSetupRid>
<CoreSetupRid Condition=" ('$(HostOSName)' == 'win' or '$(HostOSName)' == 'osx' or '$(HostOSName)' == 'freebsd') and '$(DotNetBuildFromSource)' != 'true' ">$(HostMonikerRid)</CoreSetupRid>
Expand Down

0 comments on commit c4d43f6

Please sign in to comment.