diff --git a/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj b/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj index aab73200d..b74d2ca6d 100644 --- a/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj +++ b/TestAssets/TestProjects/TestWebAppSimple/TestWebAppSimple.csproj @@ -23,7 +23,7 @@ diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a7a95e88..99bb4de80 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,7 +10,31 @@ https://github.com/dotnet/core-setup d1e2be4f140105dc9aae972f723cb6077a02fd84 - + + https://github.com/aspnet/AspNetCore + f8368097a909ba2618efbec5efa5e7e036d3a2e8 + + + https://github.com/aspnet/AspNetCore + f8368097a909ba2618efbec5efa5e7e036d3a2e8 + + + https://github.com/aspnet/AspNetCore + f8368097a909ba2618efbec5efa5e7e036d3a2e8 + + + https://github.com/aspnet/AspNetCore + f8368097a909ba2618efbec5efa5e7e036d3a2e8 + + + https://github.com/aspnet/AspNetCore + f8368097a909ba2618efbec5efa5e7e036d3a2e8 + + + https://github.com/aspnet/AspNetCore + f8368097a909ba2618efbec5efa5e7e036d3a2e8 + + https://github.com/aspnet/AspNetCore f8368097a909ba2618efbec5efa5e7e036d3a2e8 diff --git a/eng/Versions.props b/eng/Versions.props index 94bd5d108..1e41fc49c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,12 +20,13 @@ - 3.0.0-preview4-19123-01 - $(MicrosoftAspNetCoreAppPackageVersion) - $(MicrosoftAspNetCoreAppPackageVersion) - $(MicrosoftAspNetCoreAppPackageVersion) - $(MicrosoftAspNetCoreAppPackageVersion) - $(MicrosoftAspNetCoreAppPackageVersion) + 3.0.0-preview4-19123-01 + 3.0.0-preview4-19123-01 + 3.0.0-preview4-19123-01 + 3.0.0-preview4-19123-01 + 3.0.0-preview4-19123-01 + 3.0.0-preview4-19123-01 + 3.0.0-preview4-19123-01 @@ -53,9 +54,9 @@ $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) $(MicrosoftNETCoreAppPackageVersion) - $(MicrosoftAspNetCoreAppPackageVersion) + $(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion) + $(MicrosoftAspNetCoreAppRefPackageVersion) 3.0.0-preview4-27428-5 - $(MicrosoftAspNetCoreAppPackageVersion) $(MicrosoftWindowsDesktopAppPackageVersion) $(MicrosoftWindowsDesktopPackageVersion) $(MicrosoftWindowsDesktopPackageVersion) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 810d4c77b..745592bf9 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -29,17 +29,10 @@ <_NETCoreAppPackageVersion>$(MicrosoftNETCoreAppPackageVersion) <_NETStandardLibraryPackageVersion>@(_NETStandardLibraryPackageVersions->Distinct()) <_NETCorePlatformsPackageVersion>@(_NETCorePlatformsPackageVersions->Distinct()) - <_AspNetCoreAppPackageVersion>$(MicrosoftAspNetCoreAppPackageVersion) - - - <_DefaultPatchVersionForAspNetCoreApp3_0>3.0.0 - - <_DefaultPatchVersionForAspNetCoreApp3_0 Condition="$(_AspNetCoreAppPackageVersion.StartsWith('$(_DefaultPatchVersionForAspNetCoreApp3_0)-'))">$(_AspNetCoreAppPackageVersion) <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1]) <_NETStandardTargetFrameworkVersion>$(_NETStandardLibraryPackageVersion.Split('.')[0]).$(_NETStandardLibraryPackageVersion.Split('.')[1]) - <_AspNetCoreAppTargetFrameworkVersion>$(_NETCoreAppTargetFrameworkVersion) <_NETCoreSdkIsPreview Condition=" '$(DropSuffix)' != 'true' ">true @@ -61,13 +54,6 @@ TargetFramework=$(TargetFramework) - - - PackageToRestore=Microsoft.AspNetCore.App; - PackageVersionToRestore=$(MicrosoftAspNetCoreAppPackageVersion); - TargetFramework=$(TargetFramework) - - - - - + + + +