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

Fix bundled versions

Browse source
This commit is contained in:
Nick Guerrera 2019-10-22 13:14:33 -07:00
parent 05ad10ffba
commit 5d6a2e61ba
1 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,13 +14,12 @@
<_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion)</_NETStandardLibraryPackageVersion> <_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion)</_NETStandardLibraryPackageVersion>
<_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</_NETCorePlatformsPackageVersion> <_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</_NETCorePlatformsPackageVersion>
<_NETCoreApp30PackageVersion>3.0.0</_NETCoreApp30PackageVersion> <_NETCoreApp30PRuntimePackVersion>3.0.0</_NETCoreApp30PRuntimePackVersion>
<_NETCoreApp30TargetingPackVersion>$(_NETCoreApp30PackageVersion)</_NETCoreApp30TargetingPackVersion> <_NETCoreApp30TargetingPackVersion>3.0.0</_NETCoreApp30TargetingPackVersion>
<_MicrosoftWindowsDesktop30PackageVersion>$(_NETCoreApp30PackageVersion)</_MicrosoftWindowsDesktop30PackageVersion> <_WindowsDesktop30RuntimePackVersion>$(_NETCoreApp30PRuntimePackVersion)</_WindowsDesktop30RuntimePackVersion>
<_MicrosoftWindowsDesktop30TargetingPackVersion>$(_NETCoreApp30TargetingPackVersion)</_MicrosoftWindowsDesktop30TargetingPackVersion> <_WindowsDesktop30TargetingPackVersion>$(_NETCoreApp30TargetingPackVersion)</_WindowsDesktop30TargetingPackVersion>
<_AspNet30RuntimePackVersion>3.0.0</_AspNet30RuntimePackVersion>
<_MicrosoftAspNetCoreApp30PackageVersion>3.0.0</_MicrosoftAspNetCoreApp30PackageVersion> <_AspNet30TargetingPackVersion>3.0.0</_AspNet30TargetingPackVersion>
<_AspNet30TargetingPackVersion>$(_MicrosoftAspNetCoreApp30PackageVersion)</_AspNet30TargetingPackVersion>
<!-- Use only major and minor in target framework version --> <!-- Use only major and minor in target framework version -->
<_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1])</_NETCoreAppTargetFrameworkVersion> <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1])</_NETCoreAppTargetFrameworkVersion>
@ -31,7 +30,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<NetCoreRuntimePackRids Include=" <NetCore30RuntimePackRids Include="
linux-arm; linux-arm;
linux-arm64; linux-arm64;
linux-musl-arm64; linux-musl-arm64;
@ -47,7 +46,9 @@
win-x86; win-x86;
" /> " />
<AspNetCoreRuntimePackRids Include=" <NetCoreRuntimePackRids Include="@(NetCore30RuntimePackRids)"/>
<AspNetCore30RuntimePackRids Include="
win-x64; win-x64;
win-x86; win-x86;
win-arm; win-arm;
@ -56,13 +57,13 @@
linux-musl-arm64; linux-musl-arm64;
linux-x64; linux-x64;
linux-arm; linux-arm;
linux-arm64" /> linux-arm64;
" />
<AspNetCoreRuntimePackRids Include="@(AspNetCore30RuntimePackRids)" /> <AspNetCoreRuntimePackRids Include="@(AspNetCore30RuntimePackRids)" />
<NetCore30RuntimePackRids Include="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86"/>
<WindowsDesktop30RuntimePackRids Include="win-x64;win-x86" /> <WindowsDesktop30RuntimePackRids Include="win-x64;win-x86" />
<WindowsDesktopRuntimePackRids Include="@(WindowsDesktop30RuntimePackRids)" />
</ItemGroup> </ItemGroup>
<!-- <!--
@ -183,7 +184,7 @@ Copyright (c) .NET Foundation. All rights reserved.
/> />
<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App.WPF" <KnownFrameworkReference Include="Microsoft.WindowsDesktop.App.WPF"
TargetFramework="netcoreapp3.0" TargetFramework="netcoreapp3.1"
RuntimeFrameworkName="Microsoft.WindowsDesktop.App" RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)" DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)" LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)"
@ -196,7 +197,7 @@ Copyright (c) .NET Foundation. All rights reserved.
/> />
<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App.WindowsForms" <KnownFrameworkReference Include="Microsoft.WindowsDesktop.App.WindowsForms"
TargetFramework="netcoreapp3.0" TargetFramework="netcoreapp3.1"
RuntimeFrameworkName="Microsoft.WindowsDesktop.App" RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)" DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)" LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)"
@ -209,7 +210,7 @@ Copyright (c) .NET Foundation. All rights reserved.
/> />
<KnownFrameworkReference Include="Microsoft.AspNetCore.App" <KnownFrameworkReference Include="Microsoft.AspNetCore.App"
TargetFramework="netcoreapp3.0" TargetFramework="netcoreapp3.1"
RuntimeFrameworkName="Microsoft.AspNetCore.App" RuntimeFrameworkName="Microsoft.AspNetCore.App"
DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppRuntimePackageVersion)" DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppRuntimePackageVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppRuntimePackageVersion)" LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppRuntimePackageVersion)"
@ -225,7 +226,7 @@ Copyright (c) .NET Foundation. All rights reserved.
TargetFramework="netcoreapp3.0" TargetFramework="netcoreapp3.0"
RuntimeFrameworkName="Microsoft.NETCore.App" RuntimeFrameworkName="Microsoft.NETCore.App"
DefaultRuntimeFrameworkVersion="3.0.0" DefaultRuntimeFrameworkVersion="3.0.0"
LatestRuntimeFrameworkVersion="$(_NETCoreApp30PackageVersion)" LatestRuntimeFrameworkVersion="$(_NETCoreApp30PRuntimePackVersion)"
TargetingPackName="Microsoft.NETCore.App.Ref" TargetingPackName="Microsoft.NETCore.App.Ref"
TargetingPackVersion="$(_NETCoreApp30TargetingPackVersion)" TargetingPackVersion="$(_NETCoreApp30TargetingPackVersion)"
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**" RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**"
@ -236,7 +237,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<KnownAppHostPack Include="Microsoft.NETCore.App" <KnownAppHostPack Include="Microsoft.NETCore.App"
TargetFramework="netcoreapp3.0" TargetFramework="netcoreapp3.0"
AppHostPackNamePattern="Microsoft.NETCore.App.Host.**RID**" AppHostPackNamePattern="Microsoft.NETCore.App.Host.**RID**"
AppHostPackVersion="$(_NETCoreApp30PackageVersion)" AppHostPackVersion="$(_NETCoreApp30PRuntimePackVersion)"
AppHostRuntimeIdentifiers="@(NetCore30RuntimePackRids, '%3B')" AppHostRuntimeIdentifiers="@(NetCore30RuntimePackRids, '%3B')"
/> />
@ -244,9 +245,9 @@ Copyright (c) .NET Foundation. All rights reserved.
TargetFramework="netcoreapp3.0" TargetFramework="netcoreapp3.0"
RuntimeFrameworkName="Microsoft.WindowsDesktop.App" RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
DefaultRuntimeFrameworkVersion="3.0.0" DefaultRuntimeFrameworkVersion="3.0.0"
LatestRuntimeFrameworkVersion="$(_MicrosoftWindowsDesktop30PackageVersion)" LatestRuntimeFrameworkVersion="$(_WindowsDesktop30RuntimePackVersion)"
TargetingPackName="Microsoft.WindowsDesktop.App.Ref" TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
TargetingPackVersion="$(_MicrosoftWindowsDesktop30TargetingPackVersion)" TargetingPackVersion="$(_WindowsDesktop30TargetingPackVersion)"
RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**" RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**"
RuntimePackRuntimeIdentifiers="@(WindowsDesktop30RuntimePackRids, '%3B')" RuntimePackRuntimeIdentifiers="@(WindowsDesktop30RuntimePackRids, '%3B')"
IsWindowsOnly="true" IsWindowsOnly="true"
@ -256,9 +257,9 @@ Copyright (c) .NET Foundation. All rights reserved.
TargetFramework="netcoreapp3.0" TargetFramework="netcoreapp3.0"
RuntimeFrameworkName="Microsoft.WindowsDesktop.App" RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
DefaultRuntimeFrameworkVersion="3.0.0" DefaultRuntimeFrameworkVersion="3.0.0"
LatestRuntimeFrameworkVersion="$(_MicrosoftWindowsDesktop30PackageVersion)" LatestRuntimeFrameworkVersion="$(_WindowsDesktop30RuntimePackVersion)"
TargetingPackName="Microsoft.WindowsDesktop.App.Ref" TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
TargetingPackVersion="$(_MicrosoftWindowsDesktop30TargetingPackVersion)" TargetingPackVersion="$(_WindowsDesktop30TargetingPackVersion)"
RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**" RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**"
RuntimePackRuntimeIdentifiers="@(WindowsDesktop30RuntimePackRids, '%3B')" RuntimePackRuntimeIdentifiers="@(WindowsDesktop30RuntimePackRids, '%3B')"
IsWindowsOnly="true" IsWindowsOnly="true"
@ -269,9 +270,9 @@ Copyright (c) .NET Foundation. All rights reserved.
TargetFramework="netcoreapp3.0" TargetFramework="netcoreapp3.0"
RuntimeFrameworkName="Microsoft.WindowsDesktop.App" RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
DefaultRuntimeFrameworkVersion="3.0.0" DefaultRuntimeFrameworkVersion="3.0.0"
LatestRuntimeFrameworkVersion="$(_MicrosoftWindowsDesktop30PackageVersion)" LatestRuntimeFrameworkVersion="$(_WindowsDesktop30RuntimePackVersion)"
TargetingPackName="Microsoft.WindowsDesktop.App.Ref" TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
TargetingPackVersion="$(_MicrosoftWindowsDesktop30TargetingPackVersion)" TargetingPackVersion="$(_WindowsDesktop30TargetingPackVersion)"
RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**" RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**"
RuntimePackRuntimeIdentifiers="@(WindowsDesktop30RuntimePackRids, '%3B')" RuntimePackRuntimeIdentifiers="@(WindowsDesktop30RuntimePackRids, '%3B')"
IsWindowsOnly="true" IsWindowsOnly="true"
@ -282,7 +283,7 @@ Copyright (c) .NET Foundation. All rights reserved.
TargetFramework="netcoreapp3.0" TargetFramework="netcoreapp3.0"
RuntimeFrameworkName="Microsoft.AspNetCore.App" RuntimeFrameworkName="Microsoft.AspNetCore.App"
DefaultRuntimeFrameworkVersion="3.0.0" DefaultRuntimeFrameworkVersion="3.0.0"
LatestRuntimeFrameworkVersion="$(_MicrosoftAspNetCoreApp30PackageVersion)" LatestRuntimeFrameworkVersion="$(_AspNet30RuntimePackVersion)"
TargetingPackName="Microsoft.AspNetCore.App.Ref" TargetingPackName="Microsoft.AspNetCore.App.Ref"
TargetingPackVersion="$(_AspNet30TargetingPackVersion)" TargetingPackVersion="$(_AspNet30TargetingPackVersion)"
RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**" RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**"