diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4663ced2e..482db7451 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,17 +2,17 @@ - + https://github.com/dotnet/core-setup - f385116c74c1513e7e241f0586675486e9b25115 + 604ef7a61aea16bc63a402dfcb2bbe5e6b7c5971 - + https://github.com/dotnet/core-setup - f385116c74c1513e7e241f0586675486e9b25115 + 604ef7a61aea16bc63a402dfcb2bbe5e6b7c5971 - + https://github.com/dotnet/core-setup - f385116c74c1513e7e241f0586675486e9b25115 + 604ef7a61aea16bc63a402dfcb2bbe5e6b7c5971 https://github.com/aspnet/AspNetCore @@ -55,13 +55,13 @@ 71744d3163293fc31cd1c1917929cf172d22bcaa - + https://github.com/dotnet/winforms - 8b19141d6b0b221167bd7d1731cbc6aa9898da75 + 9104c48ca015b5a4c8e029c330af6d68bc11b0b8 - + https://github.com/dotnet/wpf - 105b673bddd8665580a94878db12ac97af8fa794 + 1c3dd24d7188899a5f12d1caa31630f66bd4c2fd diff --git a/eng/Versions.props b/eng/Versions.props index df7300974..77455e750 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,11 +16,11 @@ - 4.8.0-preview9.19415.10 + 4.8.0-rc1.19455.20 - 3.0.0-preview9.19416.2 + 3.0.0-rc1.19455.14 @@ -44,7 +44,7 @@ $(MicrosoftNETSdkPackageVersion) - 3.0.0-rc1-19420-08 + 3.1.0-preview1.19458.7 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -52,11 +52,11 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - 2.1.0-rc1-19420-08 + 2.1.0-preview1.19458.7 $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) $(MicrosoftAspNetCoreAppRefPackageVersion) - 3.0.0-rc1-19420-08 + 3.1.0-preview1.19458.7 $(MicrosoftWindowsDesktopAppPackageVersion) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 48bb975f7..a77fc9160 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -30,6 +30,11 @@ <_NETStandardLibraryPackageVersion>@(_NETStandardLibraryPackageVersions->Distinct()) <_NETCorePlatformsPackageVersion>@(_NETCorePlatformsPackageVersions->Distinct()) + <_NETCoreApp30PackageVersion>3.0.0-rc1-19456-20 + <_NETCoreApp30TargetingPackVersion>$(_NETCoreApp30PackageVersion) + <_MicrosoftWindowsDesktop30PackageVersion>$(_NETCoreApp30PackageVersion) + <_MicrosoftWindowsDesktop30TargetingPackVersion>$(_NETCoreApp30TargetingPackVersion) + <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1]) <_NETStandardTargetFrameworkVersion>$(_NETStandardLibraryPackageVersion.Split('.')[0]).$(_NETStandardLibraryPackageVersion.Split('.')[1]) @@ -79,6 +84,10 @@ linux-x64; linux-arm; linux-arm64" /> + + + + + + + + + + + + + + + + - - - - + - - + @@ -353,11 +351,9 @@ - - @@ -374,11 +370,9 @@ - - diff --git a/src/redist/targets/GenerateRPMs.targets b/src/redist/targets/GenerateRPMs.targets index 3f5a07e08..5755bd5df 100644 --- a/src/redist/targets/GenerateRPMs.targets +++ b/src/redist/targets/GenerateRPMs.targets @@ -286,12 +286,9 @@ - - - @@ -304,11 +301,9 @@ - - diff --git a/src/redist/targets/packaging/deb/dotnet-debian_config.json b/src/redist/targets/packaging/deb/dotnet-debian_config.json index 35a0f433f..836d41375 100644 --- a/src/redist/targets/packaging/deb/dotnet-debian_config.json +++ b/src/redist/targets/packaging/deb/dotnet-debian_config.json @@ -32,8 +32,6 @@ "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%": { "package_version": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%" }%SHARED_FRAMEWORK_DEBIAN_PACKAGE_ADDITIONAL_DEPENDENCY%, "%NETCOREAPP_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%" }, "%NETCORE_APPHOST_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%SHARED_FRAMEWORK_DEBIAN_PACKAGE_VERSION%" }, - "%NETSTANDARD_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%NET_STANDARD_DEBIAN_PACKAGE_VERSION%" }, - "%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_NAME%": { "package_version": "%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_VERSION%" }, - "%ASPNET_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%ASPNETCORE_SHAREDFX_DEBIAN_PACKAGE_VERSION%" } + "%NETSTANDARD_TARGETING_PACK_DEBIAN_PACKAGE_NAME%": { "package_version": "%NET_STANDARD_DEBIAN_PACKAGE_VERSION%" } } } diff --git a/src/redist/targets/packaging/rpm/dotnet-config.json b/src/redist/targets/packaging/rpm/dotnet-config.json index fd090e2d8..d06c428f1 100644 --- a/src/redist/targets/packaging/rpm/dotnet-config.json +++ b/src/redist/targets/packaging/rpm/dotnet-config.json @@ -37,14 +37,6 @@ { "package_name": "%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_NAME%", "package_version": "%NETSTANDARD_TARGETING_PACK_RPM_PACKAGE_VERSION%" - }, - { - "package_name": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_NAME%", - "package_version": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%" - }, - { - "package_name": "%ASPNET_TARGETING_PACK_RPM_PACKAGE_NAME%", - "package_version": "%ASPNETCORE_SHAREDFX_RPM_PACKAGE_VERSION%" } ], "directories": [ diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index cda32477f..5770d6f3a 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -61,7 +61,7 @@ namespace EndToEnd.Tests binDirectory.Should().NotHaveFilesMatching("*.dll", SearchOption.AllDirectories); } - [Fact] + [Fact(Skip = "Need support for ASP.NET on .NET Core 3.1")] public void ItCanRunAnAppUsingTheWebSdk() { var directory = TestAssets.CreateTestDirectory();