Skip to content

Commit

Permalink
Merged PR 4934: Bump 2.1.x implicit versions
Browse files Browse the repository at this point in the history
Bump 2.1.x implicit versions

    Disable SDK tests that do 2.1.x self-contained

    Delete GivenSelfContainedAppsRollForward. It doesn't work with 3.x+ already and won't work with 2.x MSRCs.
  • Loading branch information
Nick Guerrera authored and mmitche committed Dec 16, 2019
2 parents 1833431 + 5c9145f commit b37cb08
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 198 deletions.
6 changes: 3 additions & 3 deletions src/redist/targets/GenerateBundledVersions.targets
Original file line number Diff line number Diff line change
Expand Up @@ -82,19 +82,19 @@
<ImplicitPackageVariable Include="Microsoft.NETCore.App"
TargetFrameworkVersion="2.1"
DefaultVersion="2.1.0"
LatestVersion="2.1.14" />
LatestVersion="2.1.15" />
<ImplicitPackageVariable Include="Microsoft.NETCore.App"
TargetFrameworkVersion="2.2"
DefaultVersion="2.2.0"
LatestVersion="2.2.8" />
<ImplicitPackageVariable Include="Microsoft.AspNetCore.App"
TargetFrameworkVersion="2.1"
DefaultVersion="2.1.1"
LatestVersion="2.1.14"/>
LatestVersion="2.1.15"/>
<ImplicitPackageVariable Include="Microsoft.AspNetCore.All"
TargetFrameworkVersion="2.1"
DefaultVersion="2.1.1"
LatestVersion="2.1.14"/>
LatestVersion="2.1.15"/>

<ImplicitPackageVariable Include="Microsoft.AspNetCore.App"
TargetFrameworkVersion="2.2"
Expand Down
195 changes: 0 additions & 195 deletions test/EndToEnd/GivenSelfContainedAppsRollForward.cs

This file was deleted.

15 changes: 15 additions & 0 deletions test/SdkTests/TestConfig.xml
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,21 @@
Skip="true"
Issue=""
Reason="Needs .NET Core 1.1"/>

<Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_runs_a_rid_specific_app_from_the_output_folder"
Skip="true"
Issue=""
Reason="Needs .NET Core 2.1.15"/>

<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASelfContainedApp.It_can_make_a_Windows_GUI_exe"
Skip="true"
Issue=""
Reason="Needs .NET Core 2.1.15"/>

<Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAFrameworkDependentApp.It_publishes_with_or_without_apphost"
Skip="true"
Issue=""
Reason="Needs .NET Core 2.1.15 on Mac OS"/>

</SkippedTests>
</Tests>

0 comments on commit b37cb08

Please sign in to comment.