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

Fix 3.1 tests

Browse source
This commit is contained in:
Nick Guerrera 2019-09-20 16:19:37 -07:00
parent a3bb220185
commit 5c361b66bb
4 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -35,6 +35,9 @@
<_MicrosoftWindowsDesktop30PackageVersion>$(_NETCoreApp30PackageVersion)</_MicrosoftWindowsDesktop30PackageVersion> <_MicrosoftWindowsDesktop30PackageVersion>$(_NETCoreApp30PackageVersion)</_MicrosoftWindowsDesktop30PackageVersion>
<_MicrosoftWindowsDesktop30TargetingPackVersion>$(_NETCoreApp30TargetingPackVersion)</_MicrosoftWindowsDesktop30TargetingPackVersion> <_MicrosoftWindowsDesktop30TargetingPackVersion>$(_NETCoreApp30TargetingPackVersion)</_MicrosoftWindowsDesktop30TargetingPackVersion>
<_MicrosoftAspNetCoreApp30PackageVersion>3.0.0-rc2.19461.12</_MicrosoftAspNetCoreApp30PackageVersion>
<_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>
<_NETStandardTargetFrameworkVersion>$(_NETStandardLibraryPackageVersion.Split('.')[0]).$(_NETStandardLibraryPackageVersion.Split('.')[1])</_NETStandardTargetFrameworkVersion> <_NETStandardTargetFrameworkVersion>$(_NETStandardLibraryPackageVersion.Split('.')[0]).$(_NETStandardLibraryPackageVersion.Split('.')[1])</_NETStandardTargetFrameworkVersion>
@ -238,6 +241,17 @@ Copyright (c) .NET Foundation. All rights reserved.
Profile="WindowsForms" Profile="WindowsForms"
/> />
<KnownFrameworkReference Include="Microsoft.AspNetCore.App"
TargetFramework="netcoreapp3.1"
RuntimeFrameworkName="Microsoft.AspNetCore.App"
DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)"
TargetingPackName="Microsoft.AspNetCore.App.Ref"
TargetingPackVersion="$(AspNetTargetingPackVersion)"
RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**"
RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')"
/>
<!-- .NET Core 3.0 --> <!-- .NET Core 3.0 -->
<KnownFrameworkReference Include="Microsoft.NETCore.App" <KnownFrameworkReference Include="Microsoft.NETCore.App"
@ -300,10 +314,10 @@ Copyright (c) .NET Foundation. All rights reserved.
<KnownFrameworkReference Include="Microsoft.AspNetCore.App" <KnownFrameworkReference Include="Microsoft.AspNetCore.App"
TargetFramework="netcoreapp3.0" TargetFramework="netcoreapp3.0"
RuntimeFrameworkName="Microsoft.AspNetCore.App" RuntimeFrameworkName="Microsoft.AspNetCore.App"
DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)" DefaultRuntimeFrameworkVersion="$(_MicrosoftAspNetCoreApp30PackageVersion)"
LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)" LatestRuntimeFrameworkVersion="$(_MicrosoftAspNetCoreApp30PackageVersion)"
TargetingPackName="Microsoft.AspNetCore.App.Ref" TargetingPackName="Microsoft.AspNetCore.App.Ref"
TargetingPackVersion="$(AspNetTargetingPackVersion)" TargetingPackVersion="$(_AspNet30TargetingPackVersion)"
RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**" RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**"
RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')" RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')"
/> />

4
test/EndToEnd/GivenFrameworkDependentApps.cs
View file

@ -19,7 +19,7 @@ namespace EndToEnd
[ClassData(typeof(SupportedNetCoreAppVersions))] [ClassData(typeof(SupportedNetCoreAppVersions))]
public void ItDoesNotRollForwardToTheLatestVersionOfNetCore(string minorVersion) public void ItDoesNotRollForwardToTheLatestVersionOfNetCore(string minorVersion)
{ {
if (minorVersion == "3.0") if (minorVersion == "3.0" || minorVersion == "3.1")
{ {
// https://github.com/dotnet/core-sdk/issues/621 // https://github.com/dotnet/core-sdk/issues/621
return; return;
@ -31,7 +31,7 @@ namespace EndToEnd
[ClassData(typeof(SupportedAspNetCoreVersions))] [ClassData(typeof(SupportedAspNetCoreVersions))]
public void ItDoesNotRollForwardToTheLatestVersionOfAspNetCoreApp(string minorVersion) public void ItDoesNotRollForwardToTheLatestVersionOfAspNetCoreApp(string minorVersion)
{ {
if (minorVersion == "3.0") if (minorVersion == "3.0" || minorVersion == "3.1")
{ {
// https://github.com/dotnet/core-sdk/issues/621 // https://github.com/dotnet/core-sdk/issues/621
return; return;

4
test/EndToEnd/GivenSelfContainedAppsRollForward.cs
View file

@ -23,7 +23,7 @@ namespace EndToEnd
[ClassData(typeof(SupportedNetCoreAppVersions))] [ClassData(typeof(SupportedNetCoreAppVersions))]
public void ItRollsForwardToTheLatestNetCoreVersion(string minorVersion) public void ItRollsForwardToTheLatestNetCoreVersion(string minorVersion)
{ {
if (minorVersion == "3.0") if (minorVersion == "3.0" || minorVersion == "3.1")
{ {
// https://github.com/dotnet/core-sdk/issues/621 // https://github.com/dotnet/core-sdk/issues/621
return; return;
@ -35,7 +35,7 @@ namespace EndToEnd
[ClassData(typeof(SupportedAspNetCoreVersions))] [ClassData(typeof(SupportedAspNetCoreVersions))]
public void ItRollsForwardToTheLatestAspNetCoreAppVersion(string minorVersion) public void ItRollsForwardToTheLatestAspNetCoreAppVersion(string minorVersion)
{ {
if (minorVersion == "3.0") if (minorVersion == "3.0" || minorVersion == "3.1")
{ {
// https://github.com/dotnet/core-sdk/issues/621 // https://github.com/dotnet/core-sdk/issues/621
return; return;

3
test/EndToEnd/SupportedNetCoreAppVersions.cs
View file

@ -21,7 +21,8 @@ namespace EndToEnd
"2.0", "2.0",
"2.1", "2.1",
"2.2", "2.2",
"3.0" "3.0",
"3.1",
}; };
} }
} }