From 6fc778af6a9327930cb6842d4aeafd5e0625aa9c Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 3 Oct 2019 13:31:44 -0700 Subject: [PATCH 1/9] disable building Microsoft.AspNetCore.App.Ref package in 3.0 --- src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj index c8c23952f8..9fc826b1ab 100644 --- a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj +++ b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj @@ -85,7 +85,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant - + From 527b4e1c58cded4f72484901aad47aed7d3c485a Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Fri, 4 Oct 2019 15:50:40 -0700 Subject: [PATCH 2/9] Update condition for targetingPackBuilding --- Directory.Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 1d002b3001..440c9d79a8 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -91,7 +91,7 @@ aspnetcore-targeting-pack - false + false - + $(PackageId)_$(DebPackageVersion)-$(PackageRevision)_$(DebianPackageArch).deb diff --git a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj index 0bf3a72d58..e7cbb1f2ce 100644 --- a/src/Installers/Windows/TargetingPack/TargetingPack.wixproj +++ b/src/Installers/Windows/TargetingPack/TargetingPack.wixproj @@ -9,6 +9,7 @@ $(Name)-$(Platform) Package true + true 0AC34F1B-8056-4FFB-A398-E6BB7D67B48D true 5150;5151 diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets index f7323ee110..a6c7224a84 100644 --- a/src/Installers/Windows/Wix.targets +++ b/src/Installers/Windows/Wix.targets @@ -63,7 +63,7 @@ From dd13c8737adb1f955ba8a48d21217313d4d16b96 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Sat, 5 Oct 2019 00:03:05 -0700 Subject: [PATCH 4/9] Update src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj Co-Authored-By: Doug Bunting <6431421+dougbu@users.noreply.github.com> --- src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj index 9fc826b1ab..4f34f355d5 100644 --- a/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj +++ b/src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj @@ -85,7 +85,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant - + From b89103fd5fba0ac879e3fa0cd9c9e17c60b54f0c Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 8 Oct 2019 11:18:37 -0700 Subject: [PATCH 5/9] Fix Xunit skip attribute --- src/Framework/test/TargetingPackTests.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Framework/test/TargetingPackTests.cs b/src/Framework/test/TargetingPackTests.cs index 4d47e7894c..5e715f2e8f 100644 --- a/src/Framework/test/TargetingPackTests.cs +++ b/src/Framework/test/TargetingPackTests.cs @@ -55,8 +55,7 @@ namespace Microsoft.AspNetCore }); } - [Fact] - [Skip] + [Fact(Skip="https://github.com/aspnet/AspNetCore/issues/14832")] public void PlatformManifestListsAllFiles() { var platformManifestPath = Path.Combine(_targetingPackRoot, "data", "PlatformManifest.txt"); From 5e2e1cdfd3c540f2b165ed4feb06b7baa884b7e3 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 8 Oct 2019 12:32:37 -0700 Subject: [PATCH 6/9] disable other targeting pack test --- src/Framework/test/TargetingPackTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Framework/test/TargetingPackTests.cs b/src/Framework/test/TargetingPackTests.cs index 5e715f2e8f..ec8a646f48 100644 --- a/src/Framework/test/TargetingPackTests.cs +++ b/src/Framework/test/TargetingPackTests.cs @@ -28,7 +28,7 @@ namespace Microsoft.AspNetCore _targetingPackRoot = Path.Combine(TestData.GetTestDataValue("TargetingPackLayoutRoot"), "packs", "Microsoft.AspNetCore.App.Ref", TestData.GetTestDataValue("TargetingPackVersion")); } - [Fact] + [Fact(Skip="https://github.com/aspnet/AspNetCore/issues/14832")] public void AssembliesAreReferenceAssemblies() { IEnumerable dlls = Directory.GetFiles(_targetingPackRoot, "*.dll", SearchOption.AllDirectories); From a071e40e34c237cfc9a0a76ceebb1b615defad91 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 10 Oct 2019 13:41:07 -0700 Subject: [PATCH 7/9] Disable DebBuild when we're not building targetingPack --- src/Installers/Debian/Directory.Build.targets | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Installers/Debian/Directory.Build.targets b/src/Installers/Debian/Directory.Build.targets index 68f3fed93e..571343b359 100644 --- a/src/Installers/Debian/Directory.Build.targets +++ b/src/Installers/Debian/Directory.Build.targets @@ -23,7 +23,7 @@ - + @@ -49,9 +49,7 @@ - + $(PackageId)_$(DebPackageVersion)-$(PackageRevision)_$(DebianPackageArch).deb From d7faa8fc486687dc4116578bf74f3535161cb1fa Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 10 Oct 2019 14:17:15 -0700 Subject: [PATCH 8/9] Disable RPMBuild if not building RefPack, fix template test RefPack version --- src/Installers/Rpm/Directory.Build.targets | 2 +- .../test/Infrastructure/GenerateTestProps.targets | 12 ++++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/Installers/Rpm/Directory.Build.targets b/src/Installers/Rpm/Directory.Build.targets index 9a4eb927b0..3dc3ab8202 100644 --- a/src/Installers/Rpm/Directory.Build.targets +++ b/src/Installers/Rpm/Directory.Build.targets @@ -32,7 +32,7 @@ - + DATE=$([System.DateTime]::UtcNow.ToString(ddd MMM dd yyyy)) diff --git a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets index 4ce37d3f61..51e7e7f883 100644 --- a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets +++ b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets @@ -4,12 +4,20 @@ DependsOnTargets="PrepareForTest" Condition="$(DesignTimeBuild) != true"> + + SkipNonexistentProjects="false" + Condition="'$(IsTargetingPackBuilding)' != 'false'"> + + + @(_TargetingPackVersionInfo->'%(PackageVersion)' + $(AspNetCoreBaselineVersion) + + '%(PackageVersion)'); + MicrosoftAspNetCoreAppRefPackageVersion=$(MicrosoftAspNetCoreAppRefPackageVersion); MicrosoftAspNetCoreAppRuntimePackageVersion=@(_RuntimePackageVersionInfo->'%(PackageVersion)'); SupportedRuntimeIdentifiers=$(SupportedRuntimeIdentifiers); From 62a62fae7dffa007aba64acd78696acd416854ff Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 10 Oct 2019 14:43:16 -0700 Subject: [PATCH 9/9] Fix item metadata evaluation --- .../test/Infrastructure/GenerateTestProps.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets index 51e7e7f883..b9b5903ff2 100644 --- a/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets +++ b/src/ProjectTemplates/test/Infrastructure/GenerateTestProps.targets @@ -14,7 +14,7 @@ - @(_TargetingPackVersionInfo->'%(PackageVersion)' + @(TargetingPackVersionInfo.PackageVersion) $(AspNetCoreBaselineVersion)