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

Merge branch 'release/3.0.100-preview9' into merge_release/3.0.100-preview9_into_release/3.0.1xx

Browse source 
* release/3.0.100-preview9:
  [release/3.0.100-preview9] Update dependencies from dotnet/toolset (#4598)
  [release/3.0.100-preview9] Update dependencies from aspnet/AspNetCore (#4654)
  [release/3.0.100-preview9] Update dependencies from dotnet/core-setup (#4619)

Conflicts:
eng/Version.Details.xml
eng/Versions.props
This commit is contained in:
Livar Cunha 2019-09-11 13:22:16 -07:00
commit 2f1b67f414
4 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
eng/Version.Details.xml
View file

@ -2,17 +2,17 @@
<Dependencies>
<ProductDependencies>
<!-- Winforms / WPF -->
<Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.0-rc1-19455-02">
<Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.0-rc1-19456-20">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>caa8d3b1edd7eec947f6283f8342a9249b5d7171</Sha>
<Sha>8f5d7b1ba4f744199ba006cac38dfcb9a2408880</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-rc1-19455-02">
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-rc1-19456-20">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>caa8d3b1edd7eec947f6283f8342a9249b5d7171</Sha>
<Sha>8f5d7b1ba4f744199ba006cac38dfcb9a2408880</Sha>
</Dependency>
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0-rc1-19455-02">
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0-rc1-19456-20">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>caa8d3b1edd7eec947f6283f8342a9249b5d7171</Sha>
<Sha>8f5d7b1ba4f744199ba006cac38dfcb9a2408880</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-rc2.19456.2">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
@ -55,13 +55,13 @@
<Sha>6497af77ab7afe29796afde471eb1ea33277b5e7</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-preview9.19417.1" CoherentParentDependency="Microsoft.WindowsDesktop.App">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.0-rc1.19455.20" CoherentParentDependency="Microsoft.WindowsDesktop.App">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>dd6650900f5af7283c6af6ec85de4d8d51f28961</Sha>
<Sha>9104c48ca015b5a4c8e029c330af6d68bc11b0b8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.0.0-preview9.19417.4" CoherentParentDependency="Microsoft.WindowsDesktop.App">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.0.0-rc1.19455.14" CoherentParentDependency="Microsoft.WindowsDesktop.App">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>ffc3fbd836fb6ff3c28e50fec67be5b55c8b6542</Sha>
<Sha>1c3dd24d7188899a5f12d1caa31630f66bd4c2fd</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>

10
eng/Versions.props
View file

@ -16,11 +16,11 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>4.8.0-preview9.19417.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>4.8.0-rc1.19455.20</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.0.0-preview9.19417.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.0.0-rc1.19455.14</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
@ -44,7 +44,7 @@
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicrosoftNETCoreAppPackageVersion>3.0.0-rc1-19455-02</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreAppPackageVersion>3.0.0-rc1-19456-20</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreAppInternalPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreAppInternalPackageVersion>
<MicrosoftNETCoreDotNetAppHostPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetAppHostPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
@ -52,11 +52,11 @@
<HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion>
<NetCoreAppTargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</NetCoreAppTargetingPackVersion>
<NetCoreAppHostPackVersion>$(MicrosoftNETCoreAppPackageVersion)</NetCoreAppHostPackVersion>
<NETStandardLibraryRefPackageVersion>2.1.0-rc1-19455-02</NETStandardLibraryRefPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0-rc1-19456-20</NETStandardLibraryRefPackageVersion>
<WindowsDesktopTargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</WindowsDesktopTargetingPackVersion>
<AspNetCoreVersion>$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)</AspNetCoreVersion>
<AspNetTargetingPackVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</AspNetTargetingPackVersion>
<MicrosoftWindowsDesktopAppPackageVersion>3.0.0-rc1-19455-02</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopAppPackageVersion>3.0.0-rc1-19456-20</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopPackageVersion>$(MicrosoftWindowsDesktopAppPackageVersion)</MicrosoftWindowsDesktopPackageVersion>
</PropertyGroup>
<PropertyGroup>

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

@ -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>

5
test/SdkTests/TestConfig.xml
View file

@ -45,6 +45,11 @@
</TestList>
<SkippedTests>
<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToUseVB.It_builds_a_vb_wpf_app"
Skip="true"
Issue="https://github.com/dotnet/wpf/issues/1734"
Reason="VB templates removed from wpf"/>
<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAHelloWorldProject.It_publishes_portable_apps_to_the_publish_folder_and_the_app_should_run"
Skip="true"
Issue="https://github.com/dotnet/sdk/pull/3574"