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

Merging master and resolving conflicts.

Browse source
This commit is contained in:
jbeisner 2019-07-24 16:14:47 +00:00
commit 75e5139fe1
5 changed files with 57 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
eng/Version.Details.xml
View file

@ -2,72 +2,72 @@
<Dependencies>
<ProductDependencies>
<!-- Winforms / WPF -->
<Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.0-preview8-27919-09">
<Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.0-preview8-28373-17">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>3fcf1dac5531a0a92ce53af4eae4fc42316a0ccf</Sha>
<Sha>5d8d5e866113c9f144136a04222f191456dfff1d</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview8-27919-09">
<Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview8-28373-17">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>3fcf1dac5531a0a92ce53af4eae4fc42316a0ccf</Sha>
<Sha>5d8d5e866113c9f144136a04222f191456dfff1d</Sha>
</Dependency>
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0-preview8-27919-09">
<Dependency Name="NETStandard.Library.Ref" Version="2.1.0-preview8-28373-17">
<Uri>https://github.com/dotnet/core-setup</Uri>
<Sha>3fcf1dac5531a0a92ce53af4eae4fc42316a0ccf</Sha>
<Sha>5d8d5e866113c9f144136a04222f191456dfff1d</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-preview8.19371.5">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-preview8.19373.7">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>e69328b3d0bee7fd1777226d16e4d8f550acce75</Sha>
<Sha>fad6a1867ccb42bcf23c8507218b944e8798a06a</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0-preview8.19371.5">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0-preview8.19373.7">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>e69328b3d0bee7fd1777226d16e4d8f550acce75</Sha>
<Sha>fad6a1867ccb42bcf23c8507218b944e8798a06a</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.0.0-preview8.19371.5">
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.0.0-preview8.19373.7">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>e69328b3d0bee7fd1777226d16e4d8f550acce75</Sha>
<Sha>fad6a1867ccb42bcf23c8507218b944e8798a06a</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="3.0.0-preview8.19371.5">
<Dependency Name="dotnet-dev-certs" Version="3.0.0-preview8.19373.7">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>e69328b3d0bee7fd1777226d16e4d8f550acce75</Sha>
<Sha>fad6a1867ccb42bcf23c8507218b944e8798a06a</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="3.0.0-preview8.19371.5">
<Dependency Name="dotnet-user-secrets" Version="3.0.0-preview8.19373.7">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>e69328b3d0bee7fd1777226d16e4d8f550acce75</Sha>
<Sha>fad6a1867ccb42bcf23c8507218b944e8798a06a</Sha>
</Dependency>
<Dependency Name="dotnet-watch" Version="3.0.0-preview8.19371.5">
<Dependency Name="dotnet-watch" Version="3.0.0-preview8.19373.7">
<Uri>https://github.com/aspnet/AspNetCore</Uri>
<Sha>e69328b3d0bee7fd1777226d16e4d8f550acce75</Sha>
<Sha>fad6a1867ccb42bcf23c8507218b944e8798a06a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="2.0.0-preview8.19370.1">
<Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="2.0.0-preview8.19373.1">
<Uri>https://github.com/dotnet/templating</Uri>
<Sha>b103c4a9c64f62b8d940cc651b41fe774435f478</Sha>
<Sha>ee58e8a484f7e8ea188c67a984a64cfb96158a1b</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-preview8.19371.3">
<Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-preview8.19373.9">
<Uri>https://github.com/dotnet/toolset</Uri>
<Sha>be81e8e373471bdd43a096697807c55f9053a3c0</Sha>
<Sha>083658680ca51cbbba74851ff8c9d3b35a8e0911</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-preview8.19370.4">
<Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-preview8.19373.2">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>ec9f5fc673f798dd6a89c7d11a4e62727837757c</Sha>
<Sha>96e6fc555a9685153578810ab646bee2a46787bd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.100-preview8.19370.6">
<Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.100-preview8.19374.2">
<Uri>https://github.com/dotnet/cli</Uri>
<Sha>df36ae42215c0ec93ea493e6b5af45991b2c2c29</Sha>
<Sha>75385ffb2841244b45f65f40678f833a5a429c57</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-preview8.19359.1" CoherentParentDependency="Microsoft.WindowsDesktop.App">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.0-preview8.19373.2" CoherentParentDependency="Microsoft.WindowsDesktop.App">
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>bd1ec4e2cdab8e536cdb48670843904310a1854a</Sha>
<Sha>b033392baaec90ae768ef618df968d797ac95684</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.0.0-preview8.19359.5" CoherentParentDependency="Microsoft.WindowsDesktop.App">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.0.0-preview8.19373.6" CoherentParentDependency="Microsoft.WindowsDesktop.App">
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>ea72094ebe0de0da03c591752559739d6fb67f03</Sha>
<Sha>48e37ed906067d0f1dd10e9e3ae92593b3ebf299</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19369.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19373.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a190d4865fe3c86a168ec49c4fc61c90c96ae051</Sha>
<Sha>56b5e5a9debc87b98c5dd394e8a72c916099d9d5</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>

32
eng/Versions.props
View file

@ -12,39 +12,39 @@
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
</PropertyGroup>
<PropertyGroup>
<MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-preview8.19371.3</MicrosoftDotnetToolsetInternalPackageVersion>
<MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-preview8.19373.9</MicrosoftDotnetToolsetInternalPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>4.8.0-preview8.19359.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>4.8.0-preview8.19373.2</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/wpf -->
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.0.0-preview8.19359.5</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.0.0-preview8.19373.6</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.0-preview8.19371.5</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>3.0.0-preview8.19371.5</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.0-preview8.19371.5</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<dotnetdevcertsPackageVersion>3.0.0-preview8.19371.5</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>3.0.0-preview8.19371.5</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>3.0.0-preview8.19371.5</dotnetwatchPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.0-preview8.19373.7</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>3.0.0-preview8.19373.7</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.0-preview8.19373.7</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<dotnetdevcertsPackageVersion>3.0.0-preview8.19373.7</dotnetdevcertsPackageVersion>
<dotnetusersecretsPackageVersion>3.0.0-preview8.19373.7</dotnetusersecretsPackageVersion>
<dotnetwatchPackageVersion>3.0.0-preview8.19373.7</dotnetwatchPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/cli -->
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.100-preview8.19370.6</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
<MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.100-preview8.19374.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/sdk (to run tests) -->
<MicrosoftNETSdkPackageVersion>3.0.100-preview8.19370.4</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>3.0.100-preview8.19373.2</MicrosoftNETSdkPackageVersion>
<MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview8-27919-09</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview8-28373-17</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-preview8-27919-09</NETStandardLibraryRefPackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0-preview8-28373-17</NETStandardLibraryRefPackageVersion>
<WindowsDesktopTargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</WindowsDesktopTargetingPackVersion>
<AspNetCoreVersion>$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)</AspNetCoreVersion>
<AspNetTargetingPackVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</AspNetTargetingPackVersion>
<MicrosoftWindowsDesktopAppPackageVersion>3.0.0-preview8-27919-09</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopAppPackageVersion>3.0.0-preview8-28373-17</MicrosoftWindowsDesktopAppPackageVersion>
<MicrosoftWindowsDesktopPackageVersion>$(MicrosoftWindowsDesktopAppPackageVersion)</MicrosoftWindowsDesktopPackageVersion>
</PropertyGroup>
<PropertyGroup>
@ -64,9 +64,9 @@
<MicrosoftDotnetWinFormsProjectTemplates30PackageVersion>$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)</MicrosoftDotnetWinFormsProjectTemplates30PackageVersion>
<MicrosoftDotNetWpfProjectTemplates30PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates30PackageVersion>
<NUnit3Templates30PackageVersion>1.6.1</NUnit3Templates30PackageVersion>
<MicrosoftDotNetCommonItemTemplates30PackageVersion>2.0.0-preview8.19365.2</MicrosoftDotNetCommonItemTemplates30PackageVersion>
<MicrosoftDotNetCommonItemTemplates30PackageVersion>2.0.0-preview8.19373.1</MicrosoftDotNetCommonItemTemplates30PackageVersion>
<MicrosoftDotNetCommonProjectTemplates30PackageVersion>$(MicrosoftDotNetCommonItemTemplates30PackageVersion)</MicrosoftDotNetCommonProjectTemplates30PackageVersion>
<MicrosoftDotNetTestProjectTemplates30PackageVersion>1.0.2-beta4.19155.2</MicrosoftDotNetTestProjectTemplates30PackageVersion>
<MicrosoftDotNetTestProjectTemplates30PackageVersion>1.0.2-beta4.19354.2</MicrosoftDotNetTestProjectTemplates30PackageVersion>
<AspNetCorePackageVersionFor30Templates>$(AspNetCoreVersion)</AspNetCorePackageVersionFor30Templates>
<!-- 2.2 Template versions -->
<NUnit3Templates22PackageVersion>1.6.0</NUnit3Templates22PackageVersion>

10
eng/common/init-tools-native.ps1
View file

@ -98,12 +98,18 @@ try {
}
Write-Verbose "Installing $ToolName version $ToolVersion"
Write-Verbose "Executing '$InstallerPath $LocalInstallerArguments'"
Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ `"$($LocalInstallerArguments.$_)`""}) -join ' ')'"
& $InstallerPath @LocalInstallerArguments
if ($LASTEXITCODE -Ne "0") {
$errMsg = "$ToolName installation failed"
if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) {
Write-Warning $errMsg
$showNativeToolsWarning = $true
if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) {
$showNativeToolsWarning = $false
}
if ($showNativeToolsWarning) {
Write-Warning $errMsg
}
$toolInstallationFailure = $true
} else {
Write-Error $errMsg

2
global.json
View file

@ -3,6 +3,6 @@
"dotnet": "3.0.100-preview6-012264"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19369.2"
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19373.6"
}
}

1
src/redist/targets/GenerateBundledVersions.targets
View file

@ -190,7 +190,6 @@ Copyright (c) .NET Foundation. All rights reserved.
TargetingPackVersion="$(NetCoreAppTargetingPackVersion)"
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**"
RuntimePackRuntimeIdentifiers="@(NetCoreRuntimePackRids, '%3B')"
PackagesToReference="Microsoft.NETCore.App/$(NetCoreAppTargetingPackVersion)"
IsTrimmable="true"
/>