Add KnownFrameworkReference items for .NET 6
Fixes https://github.com/dotnet/sdk/issues/13950
This commit is contained in:
parent
3c9f9f35dd
commit
2c7d23afe9
2 changed files with 165 additions and 25 deletions
|
@ -28,24 +28,28 @@
|
||||||
<_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion)</_NETStandardLibraryPackageVersion>
|
<_NETStandardLibraryPackageVersion>$(NETStandardLibraryRefPackageVersion)</_NETStandardLibraryPackageVersion>
|
||||||
<_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</_NETCorePlatformsPackageVersion>
|
<_NETCorePlatformsPackageVersion>$(MicrosoftNETCorePlatformsPackageVersion)</_NETCorePlatformsPackageVersion>
|
||||||
|
|
||||||
<_NETCoreApp30RuntimePackVersion>3.0.3</_NETCoreApp30RuntimePackVersion>
|
<!-- TODO: Once .NET 5.0 has released, update these version numbers to 5.0.0 -->
|
||||||
<_NETCoreApp30TargetingPackVersion>3.0.0</_NETCoreApp30TargetingPackVersion>
|
<_NET50RuntimePackVersion>5.0.0-rc.2.20475.5</_NET50RuntimePackVersion>
|
||||||
|
<_NET50TargetingPackVersion>5.0.0-rc.2.20475.5</_NET50TargetingPackVersion>
|
||||||
|
<_WindowsDesktop50RuntimePackVersion>5.0.0-rc.2.20475.6</_WindowsDesktop50RuntimePackVersion>
|
||||||
|
<_WindowsDesktop50TargetingPackVersion>5.0.0-rc.2.20475.6</_WindowsDesktop50TargetingPackVersion>
|
||||||
|
<_AspNet50RuntimePackVersion>5.0.0-rc.2.20475.17</_AspNet50RuntimePackVersion>
|
||||||
|
<_AspNet50TargetingPackVersion>5.0.0-rc.2.20475.17</_AspNet50TargetingPackVersion>
|
||||||
|
|
||||||
<_NETCoreApp31RuntimePackVersion>3.1.7</_NETCoreApp31RuntimePackVersion>
|
<_NETCoreApp31RuntimePackVersion>3.1.7</_NETCoreApp31RuntimePackVersion>
|
||||||
<_NETCoreApp31TargetingPackVersion>3.1.0</_NETCoreApp31TargetingPackVersion>
|
<_NETCoreApp31TargetingPackVersion>3.1.0</_NETCoreApp31TargetingPackVersion>
|
||||||
|
|
||||||
<_WindowsDesktop30RuntimePackVersion>3.0.3</_WindowsDesktop30RuntimePackVersion>
|
|
||||||
<_WindowsDesktop30TargetingPackVersion>3.0.0</_WindowsDesktop30TargetingPackVersion>
|
|
||||||
|
|
||||||
<_WindowsDesktop31RuntimePackVersion>3.1.2</_WindowsDesktop31RuntimePackVersion>
|
<_WindowsDesktop31RuntimePackVersion>3.1.2</_WindowsDesktop31RuntimePackVersion>
|
||||||
<_WindowsDesktop31TargetingPackVersion>3.1.0</_WindowsDesktop31TargetingPackVersion>
|
<_WindowsDesktop31TargetingPackVersion>3.1.0</_WindowsDesktop31TargetingPackVersion>
|
||||||
|
|
||||||
<_AspNet30RuntimePackVersion>3.0.3</_AspNet30RuntimePackVersion>
|
|
||||||
<_AspNet30TargetingPackVersion>3.0.1</_AspNet30TargetingPackVersion>
|
|
||||||
|
|
||||||
<_AspNet31RuntimePackVersion>3.1.9</_AspNet31RuntimePackVersion>
|
<_AspNet31RuntimePackVersion>3.1.9</_AspNet31RuntimePackVersion>
|
||||||
<_AspNet31TargetingPackVersion>3.1.8</_AspNet31TargetingPackVersion>
|
<_AspNet31TargetingPackVersion>3.1.8</_AspNet31TargetingPackVersion>
|
||||||
|
|
||||||
|
<_NETCoreApp30RuntimePackVersion>3.0.3</_NETCoreApp30RuntimePackVersion>
|
||||||
|
<_NETCoreApp30TargetingPackVersion>3.0.0</_NETCoreApp30TargetingPackVersion>
|
||||||
|
<_WindowsDesktop30RuntimePackVersion>3.0.3</_WindowsDesktop30RuntimePackVersion>
|
||||||
|
<_WindowsDesktop30TargetingPackVersion>3.0.0</_WindowsDesktop30TargetingPackVersion>
|
||||||
|
<_AspNet30RuntimePackVersion>3.0.3</_AspNet30RuntimePackVersion>
|
||||||
|
<_AspNet30TargetingPackVersion>3.0.1</_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>
|
||||||
<_NETStandardTargetFrameworkVersion>$(_NETStandardLibraryPackageVersion.Split('.')[0]).$(_NETStandardLibraryPackageVersion.Split('.')[1])</_NETStandardTargetFrameworkVersion>
|
<_NETStandardTargetFrameworkVersion>$(_NETStandardLibraryPackageVersion.Split('.')[0]).$(_NETStandardLibraryPackageVersion.Split('.')[1])</_NETStandardTargetFrameworkVersion>
|
||||||
|
@ -73,10 +77,10 @@
|
||||||
|
|
||||||
<NetCore31RuntimePackRids Include="@(NetCore30RuntimePackRids)"/>
|
<NetCore31RuntimePackRids Include="@(NetCore30RuntimePackRids)"/>
|
||||||
|
|
||||||
<NetCore5AppHostRids Include="@(NetCore31RuntimePackRids)"/>
|
<Net50AppHostRids Include="@(NetCore31RuntimePackRids)"/>
|
||||||
|
|
||||||
<NetCore5RuntimePackRids Include="
|
<Net50RuntimePackRids Include="
|
||||||
@(NetCore5AppHostRids);
|
@(Net50AppHostRids);
|
||||||
ios-arm64;
|
ios-arm64;
|
||||||
ios-arm;
|
ios-arm;
|
||||||
ios-x64;
|
ios-x64;
|
||||||
|
@ -90,8 +94,8 @@
|
||||||
browser-wasm;
|
browser-wasm;
|
||||||
" />
|
" />
|
||||||
|
|
||||||
<NetCoreAppHostRids Include="@(NetCore5AppHostRids)" />
|
<NetCoreAppHostRids Include="@(Net50AppHostRids)" />
|
||||||
<NetCoreRuntimePackRids Include="@(NetCore5RuntimePackRids)" />
|
<NetCoreRuntimePackRids Include="@(Net50RuntimePackRids)" />
|
||||||
|
|
||||||
<AspNetCore30RuntimePackRids Include="
|
<AspNetCore30RuntimePackRids Include="
|
||||||
win-x64;
|
win-x64;
|
||||||
|
@ -105,7 +109,8 @@
|
||||||
linux-arm64;
|
linux-arm64;
|
||||||
" />
|
" />
|
||||||
|
|
||||||
<Crossgen2SupportedRids Include="linux-musl-x64;linux-x64;win-x64" />
|
<Net50Crossgen2SupportedRids Include="linux-musl-x64;linux-x64;win-x64" />
|
||||||
|
<Crossgen2SupportedRids Include="@(Crossgen2SupportedRids)" />
|
||||||
|
|
||||||
<AspNetCore31RuntimePackRids Include="@(AspNetCore30RuntimePackRids)" />
|
<AspNetCore31RuntimePackRids Include="@(AspNetCore30RuntimePackRids)" />
|
||||||
<AspNetCore50RuntimePackRids Include="@(AspNetCore31RuntimePackRids);win-arm64" />
|
<AspNetCore50RuntimePackRids Include="@(AspNetCore31RuntimePackRids);win-arm64" />
|
||||||
|
@ -113,7 +118,8 @@
|
||||||
|
|
||||||
<WindowsDesktop30RuntimePackRids Include="win-x64;win-x86" />
|
<WindowsDesktop30RuntimePackRids Include="win-x64;win-x86" />
|
||||||
<WindowsDesktop31RuntimePackRids Include="@(WindowsDesktop30RuntimePackRids)" />
|
<WindowsDesktop31RuntimePackRids Include="@(WindowsDesktop30RuntimePackRids)" />
|
||||||
<WindowsDesktopRuntimePackRids Include="@(WindowsDesktop31RuntimePackRids)" />
|
<WindowsDesktop50RuntimePackRids Include="@(WindowsDesktop31RuntimePackRids)" />
|
||||||
|
<WindowsDesktopRuntimePackRids Include="@(WindowsDesktop50RuntimePackRids)" />
|
||||||
<!-- TODO: remove this once WPF is available on ARM64 and replace usage
|
<!-- TODO: remove this once WPF is available on ARM64 and replace usage
|
||||||
of this group for WindowsDesktopRuntimePackRids. -->
|
of this group for WindowsDesktopRuntimePackRids. -->
|
||||||
<WindowsDesktopRuntimePackWinformsRids Include="@(WindowsDesktopRuntimePackRids);win-arm64" />
|
<WindowsDesktopRuntimePackWinformsRids Include="@(WindowsDesktopRuntimePackRids);win-arm64" />
|
||||||
|
@ -206,8 +212,9 @@ Copyright (c) .NET Foundation. All rights reserved.
|
||||||
@(ImplicitPackageVariable->'<ImplicitPackageReferenceVersion Include="%(Identity)" TargetFrameworkVersion="%(TargetFrameworkVersion)" DefaultVersion="%(DefaultVersion)" LatestVersion="%(LatestVersion)"/>', '
|
@(ImplicitPackageVariable->'<ImplicitPackageReferenceVersion Include="%(Identity)" TargetFrameworkVersion="%(TargetFrameworkVersion)" DefaultVersion="%(DefaultVersion)" LatestVersion="%(LatestVersion)"/>', '
|
||||||
')
|
')
|
||||||
|
|
||||||
|
<!-- .NET 6.0 -->
|
||||||
<KnownFrameworkReference Include="Microsoft.NETCore.App"
|
<KnownFrameworkReference Include="Microsoft.NETCore.App"
|
||||||
TargetFramework="netcoreapp5.0"
|
TargetFramework="netcoreapp6.0"
|
||||||
RuntimeFrameworkName="Microsoft.NETCore.App"
|
RuntimeFrameworkName="Microsoft.NETCore.App"
|
||||||
DefaultRuntimeFrameworkVersion="$(MicrosoftNETCoreAppDefaultRuntimeFrameworkVersion)"
|
DefaultRuntimeFrameworkVersion="$(MicrosoftNETCoreAppDefaultRuntimeFrameworkVersion)"
|
||||||
LatestRuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
|
LatestRuntimeFrameworkVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
|
||||||
|
@ -219,21 +226,21 @@ Copyright (c) .NET Foundation. All rights reserved.
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<KnownAppHostPack Include="Microsoft.NETCore.App"
|
<KnownAppHostPack Include="Microsoft.NETCore.App"
|
||||||
TargetFramework="netcoreapp5.0"
|
TargetFramework="netcoreapp6.0"
|
||||||
AppHostPackNamePattern="Microsoft.NETCore.App.Host.**RID**"
|
AppHostPackNamePattern="Microsoft.NETCore.App.Host.**RID**"
|
||||||
AppHostPackVersion="$(_NETCoreAppPackageVersion)"
|
AppHostPackVersion="$(_NETCoreAppPackageVersion)"
|
||||||
AppHostRuntimeIdentifiers="@(NetCoreAppHostRids, '%3B')"
|
AppHostRuntimeIdentifiers="@(NetCoreAppHostRids, '%3B')"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<KnownCrossgen2Pack Include="Microsoft.NETCore.App.Crossgen2"
|
<KnownCrossgen2Pack Include="Microsoft.NETCore.App.Crossgen2"
|
||||||
TargetFramework="netcoreapp5.0"
|
TargetFramework="netcoreapp6.0"
|
||||||
Crossgen2PackNamePattern="Microsoft.NETCore.App.Crossgen2.**RID**"
|
Crossgen2PackNamePattern="Microsoft.NETCore.App.Crossgen2.**RID**"
|
||||||
Crossgen2PackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
|
Crossgen2PackVersion="$(MicrosoftNETCoreAppRuntimePackageVersion)"
|
||||||
Crossgen2RuntimeIdentifiers="@(Crossgen2SupportedRids, '%3B')"
|
Crossgen2RuntimeIdentifiers="@(Crossgen2SupportedRids, '%3B')"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App"
|
<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App"
|
||||||
TargetFramework="netcoreapp5.0"
|
TargetFramework="netcoreapp6.0"
|
||||||
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
|
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
|
||||||
DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppDefaultRuntimeFrameworkVersion)"
|
DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppDefaultRuntimeFrameworkVersion)"
|
||||||
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)"
|
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)"
|
||||||
|
@ -245,7 +252,7 @@ Copyright (c) .NET Foundation. All rights reserved.
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App.WPF"
|
<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App.WPF"
|
||||||
TargetFramework="netcoreapp5.0"
|
TargetFramework="netcoreapp6.0"
|
||||||
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
|
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
|
||||||
DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppDefaultRuntimeFrameworkVersion)"
|
DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppDefaultRuntimeFrameworkVersion)"
|
||||||
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)"
|
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)"
|
||||||
|
@ -258,7 +265,7 @@ Copyright (c) .NET Foundation. All rights reserved.
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App.WindowsForms"
|
<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App.WindowsForms"
|
||||||
TargetFramework="netcoreapp5.0"
|
TargetFramework="netcoreapp6.0"
|
||||||
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
|
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
|
||||||
DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppDefaultRuntimeFrameworkVersion)"
|
DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppDefaultRuntimeFrameworkVersion)"
|
||||||
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)"
|
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopAppRuntimePackageVersion)"
|
||||||
|
@ -271,13 +278,128 @@ Copyright (c) .NET Foundation. All rights reserved.
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<KnownFrameworkReference Include="Microsoft.AspNetCore.App"
|
<KnownFrameworkReference Include="Microsoft.AspNetCore.App"
|
||||||
TargetFramework="netcoreapp5.0"
|
TargetFramework="netcoreapp6.0"
|
||||||
RuntimeFrameworkName="Microsoft.AspNetCore.App"
|
RuntimeFrameworkName="Microsoft.AspNetCore.App"
|
||||||
DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppDefaultRuntimeFrameworkVersion)"
|
DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppDefaultRuntimeFrameworkVersion)"
|
||||||
LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppRuntimePackageVersion)"
|
LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppRuntimePackageVersion)"
|
||||||
TargetingPackName="Microsoft.AspNetCore.App.Ref"
|
TargetingPackName="Microsoft.AspNetCore.App.Ref"
|
||||||
TargetingPackVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)"
|
TargetingPackVersion="$(MicrosoftAspNetCoreAppRefPackageVersion)"
|
||||||
RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**"
|
RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**"
|
||||||
|
RuntimePackRuntimeIdentifiers="@(AspNetCore60RuntimePackRids, '%3B')"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"
|
||||||
|
TargetFramework="net6.0-windows10.0.17763.0"
|
||||||
|
RuntimeFrameworkName="Microsoft.Windows.SDK.NET.Ref"
|
||||||
|
DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)"
|
||||||
|
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)"
|
||||||
|
TargetingPackName="Microsoft.Windows.SDK.NET.Ref"
|
||||||
|
TargetingPackVersion="$(MicrosoftWindowsSDKNETRef10_0_17763PackageVersion)"
|
||||||
|
RuntimePackAlwaysCopyLocal="true"
|
||||||
|
RuntimePackNamePatterns="Microsoft.Windows.SDK.NET.Ref"
|
||||||
|
RuntimePackRuntimeIdentifiers="any"
|
||||||
|
IsWindowsOnly="true"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"
|
||||||
|
TargetFramework="net6.0-windows10.0.18362.0"
|
||||||
|
RuntimeFrameworkName="Microsoft.Windows.SDK.NET.Ref"
|
||||||
|
DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)"
|
||||||
|
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)"
|
||||||
|
TargetingPackName="Microsoft.Windows.SDK.NET.Ref"
|
||||||
|
TargetingPackVersion="$(MicrosoftWindowsSDKNETRef10_0_18362PackageVersion)"
|
||||||
|
RuntimePackAlwaysCopyLocal="true"
|
||||||
|
RuntimePackNamePatterns="Microsoft.Windows.SDK.NET.Ref"
|
||||||
|
RuntimePackRuntimeIdentifiers="any"
|
||||||
|
IsWindowsOnly="true"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<KnownFrameworkReference Include="Microsoft.Windows.SDK.NET.Ref"
|
||||||
|
TargetFramework="net6.0-windows10.0.19041.0"
|
||||||
|
RuntimeFrameworkName="Microsoft.Windows.SDK.NET.Ref"
|
||||||
|
DefaultRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)"
|
||||||
|
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)"
|
||||||
|
TargetingPackName="Microsoft.Windows.SDK.NET.Ref"
|
||||||
|
TargetingPackVersion="$(MicrosoftWindowsSDKNETRef10_0_19041PackageVersion)"
|
||||||
|
RuntimePackAlwaysCopyLocal="true"
|
||||||
|
RuntimePackNamePatterns="Microsoft.Windows.SDK.NET.Ref"
|
||||||
|
RuntimePackRuntimeIdentifiers="any"
|
||||||
|
IsWindowsOnly="true"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<!-- .NET 5.0 -->
|
||||||
|
<KnownFrameworkReference Include="Microsoft.NETCore.App"
|
||||||
|
TargetFramework="netcoreapp5.0"
|
||||||
|
RuntimeFrameworkName="Microsoft.NETCore.App"
|
||||||
|
DefaultRuntimeFrameworkVersion="5.0.0"
|
||||||
|
LatestRuntimeFrameworkVersion="$(_NET50RuntimePackVersion)"
|
||||||
|
TargetingPackName="Microsoft.NETCore.App.Ref"
|
||||||
|
TargetingPackVersion="$(_NET50TargetingPackVersion)"
|
||||||
|
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**"
|
||||||
|
RuntimePackRuntimeIdentifiers="@(Net50RuntimePackRids, '%3B')"
|
||||||
|
IsTrimmable="true"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<KnownAppHostPack Include="Microsoft.NETCore.App"
|
||||||
|
TargetFramework="netcoreapp5.0"
|
||||||
|
AppHostPackNamePattern="Microsoft.NETCore.App.Host.**RID**"
|
||||||
|
AppHostPackVersion="$(_NET50RuntimePackVersion)"
|
||||||
|
AppHostRuntimeIdentifiers="@(Net50AppHostRids, '%3B')"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<KnownCrossgen2Pack Include="Microsoft.NETCore.App.Crossgen2"
|
||||||
|
TargetFramework="netcoreapp5.0"
|
||||||
|
Crossgen2PackNamePattern="Microsoft.NETCore.App.Crossgen2.**RID**"
|
||||||
|
Crossgen2PackVersion="$(_NET50RuntimePackVersion)"
|
||||||
|
Crossgen2RuntimeIdentifiers="@(Net50Crossgen2SupportedRids, '%3B')"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App"
|
||||||
|
TargetFramework="netcoreapp5.0"
|
||||||
|
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
|
||||||
|
DefaultRuntimeFrameworkVersion="5.0.0"
|
||||||
|
LatestRuntimeFrameworkVersion="$(_WindowsDesktop50RuntimePackVersion)"
|
||||||
|
TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
|
||||||
|
TargetingPackVersion="$(_WindowsDesktop50TargetingPackVersion)"
|
||||||
|
RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**"
|
||||||
|
RuntimePackRuntimeIdentifiers="@(WindowsDesktop50RuntimePackRids, '%3B')"
|
||||||
|
IsWindowsOnly="true"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App.WPF"
|
||||||
|
TargetFramework="netcoreapp5.0"
|
||||||
|
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
|
||||||
|
DefaultRuntimeFrameworkVersion="5.0.0"
|
||||||
|
LatestRuntimeFrameworkVersion="$(_WindowsDesktop50RuntimePackVersion)"
|
||||||
|
TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
|
||||||
|
TargetingPackVersion="$(_WindowsDesktop50TargetingPackVersion)"
|
||||||
|
RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**"
|
||||||
|
RuntimePackRuntimeIdentifiers="@(WindowsDesktop50RuntimePackRids, '%3B')"
|
||||||
|
IsWindowsOnly="true"
|
||||||
|
Profile="WPF"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<KnownFrameworkReference Include="Microsoft.WindowsDesktop.App.WindowsForms"
|
||||||
|
TargetFramework="netcoreapp5.0"
|
||||||
|
RuntimeFrameworkName="Microsoft.WindowsDesktop.App"
|
||||||
|
DefaultRuntimeFrameworkVersion="5.0.0"
|
||||||
|
LatestRuntimeFrameworkVersion="$(_WindowsDesktop50RuntimePackVersion)"
|
||||||
|
TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
|
||||||
|
TargetingPackVersion="$(_WindowsDesktop50TargetingPackVersion)"
|
||||||
|
RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**"
|
||||||
|
RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackWinformsRids, '%3B')"
|
||||||
|
IsWindowsOnly="true"
|
||||||
|
Profile="WindowsForms"
|
||||||
|
/>
|
||||||
|
|
||||||
|
<KnownFrameworkReference Include="Microsoft.AspNetCore.App"
|
||||||
|
TargetFramework="netcoreapp5.0"
|
||||||
|
RuntimeFrameworkName="Microsoft.AspNetCore.App"
|
||||||
|
DefaultRuntimeFrameworkVersion="5.0.0"
|
||||||
|
LatestRuntimeFrameworkVersion="$(_AspNet50RuntimePackVersion)"
|
||||||
|
TargetingPackName="Microsoft.AspNetCore.App.Ref"
|
||||||
|
TargetingPackVersion="$(_AspNet50TargetingPackVersion)"
|
||||||
|
RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**"
|
||||||
RuntimePackRuntimeIdentifiers="@(AspNetCore50RuntimePackRids, '%3B')"
|
RuntimePackRuntimeIdentifiers="@(AspNetCore50RuntimePackRids, '%3B')"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,20 @@ namespace EndToEnd.Tests
|
||||||
{
|
{
|
||||||
public class ProjectBuildTests : TestBase
|
public class ProjectBuildTests : TestBase
|
||||||
{
|
{
|
||||||
|
// TODO: Once console template is updated to target net6.0, remove this logic
|
||||||
|
void RetargetProject(string projectDirectory)
|
||||||
|
{
|
||||||
|
var projectFile = Directory.GetFiles(projectDirectory, "*.csproj").Single();
|
||||||
|
|
||||||
|
var projectXml = XDocument.Load(projectFile);
|
||||||
|
var ns = projectXml.Root.Name.Namespace;
|
||||||
|
|
||||||
|
projectXml.Root.Element(ns + "PropertyGroup")
|
||||||
|
.Element(ns + "TargetFramework").Value = "net6.0";
|
||||||
|
|
||||||
|
projectXml.Save(projectFile);
|
||||||
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
public void ItCanNewRestoreBuildRunCleanMSBuildProject()
|
public void ItCanNewRestoreBuildRunCleanMSBuildProject()
|
||||||
{
|
{
|
||||||
|
@ -25,6 +39,8 @@ namespace EndToEnd.Tests
|
||||||
.Execute(newArgs)
|
.Execute(newArgs)
|
||||||
.Should().Pass();
|
.Should().Pass();
|
||||||
|
|
||||||
|
RetargetProject(projectDirectory);
|
||||||
|
|
||||||
new RestoreCommand()
|
new RestoreCommand()
|
||||||
.WithWorkingDirectory(projectDirectory)
|
.WithWorkingDirectory(projectDirectory)
|
||||||
.Execute()
|
.Execute()
|
||||||
|
@ -63,6 +79,8 @@ namespace EndToEnd.Tests
|
||||||
.Execute(newArgs)
|
.Execute(newArgs)
|
||||||
.Should().Pass();
|
.Should().Pass();
|
||||||
|
|
||||||
|
RetargetProject(projectDirectory);
|
||||||
|
|
||||||
string projectPath = Path.Combine(projectDirectory, directory.Name + ".csproj");
|
string projectPath = Path.Combine(projectDirectory, directory.Name + ".csproj");
|
||||||
|
|
||||||
var project = XDocument.Load(projectPath);
|
var project = XDocument.Load(projectPath);
|
||||||
|
|
Loading…
Reference in a new issue