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

Merge pull request #477 from dsplaisted/netstandard2_1

Browse source 
Add bundled version information for targeting .NET Standard 2.1
This commit is contained in:
Daniel Plaisted 2019-02-12 18:48:38 -08:00 • committed by GitHub
commit b70c2aa338
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
eng/Version.Details.xml
View file

@ -26,6 +26,10 @@
<Uri>https://github.com/dotnet/toolset</Uri> <Uri>https://github.com/dotnet/toolset</Uri>
<Sha>536d6a237f4de7b248e75b63256b75c1798e1bd7</Sha> <Sha>536d6a237f4de7b248e75b63256b75c1798e1bd7</Sha>
</Dependency> </Dependency>
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19078.1">
<Uri>https://github.com/dotnet/standard</Uri>
<Sha></Sha>
</Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19107.1"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19107.1">

3
eng/Versions.props
View file

@ -31,6 +31,9 @@
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview-27408-1</MicrosoftNETCoreAppPackageVersion> <MicrosoftNETCoreAppPackageVersion>3.0.0-preview-27408-1</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion> <MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup>
<NETStandardLibraryPackageVersion>2.1.0-prerelease.19078.1</NETStandardLibraryPackageVersion>
</PropertyGroup>
<PropertyGroup> <PropertyGroup>
<MicrosoftDotNetCommonItemTemplatesPackageVersion>1.0.2-beta5.19066.2</MicrosoftDotNetCommonItemTemplatesPackageVersion> <MicrosoftDotNetCommonItemTemplatesPackageVersion>1.0.2-beta5.19066.2</MicrosoftDotNetCommonItemTemplatesPackageVersion>
<MicrosoftDotNetCommonProjectTemplates30PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonProjectTemplates30PackageVersion> <MicrosoftDotNetCommonProjectTemplates30PackageVersion>$(MicrosoftDotNetCommonItemTemplatesPackageVersion)</MicrosoftDotNetCommonProjectTemplates30PackageVersion>

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

@ -99,11 +99,11 @@
<ImplicitPackageVariable Include="Microsoft.NETCore.App" <ImplicitPackageVariable Include="Microsoft.NETCore.App"
TargetFrameworkVersion="1.0" TargetFrameworkVersion="1.0"
DefaultVersion="1.0.5" DefaultVersion="1.0.5"
LatestVersion="1.0.13" /> LatestVersion="1.0.14" />
<ImplicitPackageVariable Include="Microsoft.NETCore.App" <ImplicitPackageVariable Include="Microsoft.NETCore.App"
TargetFrameworkVersion="1.1" TargetFrameworkVersion="1.1"
DefaultVersion="1.1.2" DefaultVersion="1.1.2"
LatestVersion="1.1.10" /> LatestVersion="1.1.11" />
<ImplicitPackageVariable Include="Microsoft.NETCore.App" <ImplicitPackageVariable Include="Microsoft.NETCore.App"
TargetFrameworkVersion="2.0" TargetFrameworkVersion="2.0"
DefaultVersion="2.0.0" DefaultVersion="2.0.0"
@ -111,11 +111,11 @@
<ImplicitPackageVariable Include="Microsoft.NETCore.App" <ImplicitPackageVariable Include="Microsoft.NETCore.App"
TargetFrameworkVersion="2.1" TargetFrameworkVersion="2.1"
DefaultVersion="2.1.0" DefaultVersion="2.1.0"
LatestVersion="2.1.7" /> LatestVersion="2.1.8" />
<ImplicitPackageVariable Include="Microsoft.NETCore.App" <ImplicitPackageVariable Include="Microsoft.NETCore.App"
TargetFrameworkVersion="2.2" TargetFrameworkVersion="2.2"
DefaultVersion="2.2.0" DefaultVersion="2.2.0"
LatestVersion="2.2.1" /> LatestVersion="2.2.2" />
<ImplicitPackageVariable Include="Microsoft.NETCore.App" <ImplicitPackageVariable Include="Microsoft.NETCore.App"
TargetFrameworkVersion="3.0" TargetFrameworkVersion="3.0"
DefaultVersion="$(_NETCoreAppPackageVersion)" DefaultVersion="$(_NETCoreAppPackageVersion)"
@ -124,20 +124,20 @@
<ImplicitPackageVariable Include="Microsoft.AspNetCore.App" <ImplicitPackageVariable Include="Microsoft.AspNetCore.App"
TargetFrameworkVersion="2.1" TargetFrameworkVersion="2.1"
DefaultVersion="2.1.1" DefaultVersion="2.1.1"
LatestVersion="2.1.7"/> LatestVersion="2.1.8"/>
<ImplicitPackageVariable Include="Microsoft.AspNetCore.All" <ImplicitPackageVariable Include="Microsoft.AspNetCore.All"
TargetFrameworkVersion="2.1" TargetFrameworkVersion="2.1"
DefaultVersion="2.1.1" DefaultVersion="2.1.1"
LatestVersion="2.1.7"/> LatestVersion="2.1.8"/>
<ImplicitPackageVariable Include="Microsoft.AspNetCore.App" <ImplicitPackageVariable Include="Microsoft.AspNetCore.App"
TargetFrameworkVersion="2.2" TargetFrameworkVersion="2.2"
DefaultVersion="2.2.0" DefaultVersion="2.2.0"
LatestVersion="2.2.1"/> LatestVersion="2.2.2"/>
<ImplicitPackageVariable Include="Microsoft.AspNetCore.All" <ImplicitPackageVariable Include="Microsoft.AspNetCore.All"
TargetFrameworkVersion="2.2" TargetFrameworkVersion="2.2"
DefaultVersion="2.2.0" DefaultVersion="2.2.0"
LatestVersion="2.2.1"/> LatestVersion="2.2.2"/>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -235,6 +235,14 @@ Copyright (c) .NET Foundation. All rights reserved.
RuntimePackNamePatterns="runtime.**RID**.Microsoft.AspNetCore.App" RuntimePackNamePatterns="runtime.**RID**.Microsoft.AspNetCore.App"
RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')" RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')"
/> />
<KnownFrameworkReference Include="NETStandard.Library"
TargetFramework="netstandard2.1"
TargetingPackName="NETStandard.Library"
TargetingPackVersion="$(NETStandardLibraryPackageVersion)"
TargetingPackFormat="NETStandardLegacy"
/>
</ItemGroup> </ItemGroup>
</Project> </Project>
]]> ]]>