From 5bdf0fac221e1aac4fba9d0d230f0d499fad0f2d Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Mon, 15 Apr 2019 10:07:37 -0500 Subject: [PATCH 1/5] Produce mostly empty Microsoft.NETCore.App Package is now empty with a platforms package dependency. Create Microsoft.NETCore.App.Insertion transport package for compatibility workarounds. This commit also moves netcoreapp sfx generation to the new infrastructure to more easily handle the migration away from Microsoft.NETCore.App. --- config.json | 6 - dir.props | 3 +- eng/jobs/windows-build.yml | 6 - src/dir.proj | 1 - .../framework.packaging.targets | 3 +- .../packaging-tools/packaging-tools.targets | 22 ++- .../sharedFramework/sharedFramework.csproj | 78 ++++++++- .../sharedFramework/breadcrumbstorefolder.wxs | 38 ++++ .../windows/sharedFramework/product.wxs | 8 + .../sharedFramework/werrelatedkeys.wxs | 52 ++++++ src/pkg/packaging-tools/windows/wix.targets | 18 +- src/pkg/packaging/windows/package.targets | 13 -- .../windows/sharedframework/generatemsi.ps1 | 163 ----------------- .../windows/sharedframework/provider.wxs | 9 - .../windows/sharedframework/registrykeys.wxs | 42 ----- .../sharedframework/sharedframework.wxs | 64 ------- src/pkg/projects/descriptions.json | 5 + .../Microsoft.NETCore.App.Insertion.pkgproj | 25 +++ .../pkg/Microsoft.NETCore.App.pkgproj | 59 ++++--- .../pkg/Microsoft.NETCore.App.targets | 22 --- src/pkg/projects/netcoreapp/pkg/dir.props | 2 +- src/sharedFramework/framework/Program.cs | 11 -- .../framework/framework.csproj | 7 - .../lockedhost/lockedhost.csproj | 16 -- src/sharedFramework/sharedFramework.proj | 165 ------------------ 25 files changed, 285 insertions(+), 553 deletions(-) create mode 100644 src/pkg/packaging-tools/windows/sharedFramework/breadcrumbstorefolder.wxs create mode 100644 src/pkg/packaging-tools/windows/sharedFramework/werrelatedkeys.wxs delete mode 100644 src/pkg/packaging/windows/sharedframework/generatemsi.ps1 delete mode 100644 src/pkg/packaging/windows/sharedframework/provider.wxs delete mode 100644 src/pkg/packaging/windows/sharedframework/registrykeys.wxs delete mode 100644 src/pkg/packaging/windows/sharedframework/sharedframework.wxs create mode 100644 src/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Insertion.pkgproj delete mode 100644 src/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.targets delete mode 100644 src/sharedFramework/framework/Program.cs delete mode 100644 src/sharedFramework/framework/framework.csproj delete mode 100644 src/sharedFramework/lockedhost/lockedhost.csproj delete mode 100644 src/sharedFramework/sharedFramework.proj diff --git a/config.json b/config.json index 6c513caab5..7707a94e0d 100644 --- a/config.json +++ b/config.json @@ -214,12 +214,6 @@ "Project": "publish\\publish.proj" } }, - "sharedfx-netcoreapp": { - "description": "Build legacy netcoreapp Shared Framework project.", - "settings": { - "Project": "src\\sharedframework\\sharedframework.proj" - } - }, "sharedfx": { "description": "Build Shared Framework projects.", "settings": { diff --git a/dir.props b/dir.props index 6bf5b7e532..d6d085c862 100644 --- a/dir.props +++ b/dir.props @@ -276,7 +276,8 @@ $(PackageOutputPath) $(PackagesBasePath)symbols/ - $(IntermediateOutputRootPath)sharedFrameworkPublish\ + + $(IntermediateOutputRootPath)sharedFrameworkPublish/ $(IntermediateOutputRootPath)sharedFrameworkPublish.symbols\ diff --git a/eng/jobs/windows-build.yml b/eng/jobs/windows-build.yml index d9d0fdf714..578a836435 100644 --- a/eng/jobs/windows-build.yml +++ b/eng/jobs/windows-build.yml @@ -99,12 +99,6 @@ jobs: condition: succeeded() # Build Shared Frameworks - - script: build.cmd -sharedfx-netcoreapp - -- '$(CommonMSBuildArgs) - /bl:$(Build.SourcesDirectory)\sharedframework-netcoreapp.binlog' - displayName: Build sharedframework layout (legacy infrastructure) - condition: succeeded() - - script: build.cmd -sharedfx -- '$(CommonMSBuildArgs) /bl:$(Build.SourcesDirectory)\sharedframework.binlog' diff --git a/src/dir.proj b/src/dir.proj index 8d329159f4..f84501246f 100644 --- a/src/dir.proj +++ b/src/dir.proj @@ -10,7 +10,6 @@ - diff --git a/src/pkg/packaging-tools/framework.packaging.targets b/src/pkg/packaging-tools/framework.packaging.targets index 84e8954fe7..b5c463526c 100644 --- a/src/pkg/packaging-tools/framework.packaging.targets +++ b/src/pkg/packaging-tools/framework.packaging.targets @@ -10,6 +10,7 @@ diff --git a/src/pkg/packaging-tools/packaging-tools.targets b/src/pkg/packaging-tools/packaging-tools.targets index 2cf54178f4..95836878c0 100644 --- a/src/pkg/packaging-tools/packaging-tools.targets +++ b/src/pkg/packaging-tools/packaging-tools.targets @@ -57,9 +57,29 @@ $(InstallerName)-$(InstallerBuildPart) - $(AssetOutputPath)$(InstallerFileNameWithoutExtension)$(InstallerExtension) + $(AssetOutputPath)$(InstallerFileNameWithoutExtension)$(InstallerExtension) $(AssetOutputPath)$(InstallerFileNameWithoutExtension)$(CompressedFileExtension) + + + + $(SharedFrameworkLayoutDir)shared/ + + + + + false + false + false + + + + diff --git a/src/pkg/packaging-tools/sharedFramework/sharedFramework.csproj b/src/pkg/packaging-tools/sharedFramework/sharedFramework.csproj index 497c79e3f6..cfb52b90d8 100644 --- a/src/pkg/packaging-tools/sharedFramework/sharedFramework.csproj +++ b/src/pkg/packaging-tools/sharedFramework/sharedFramework.csproj @@ -48,12 +48,21 @@ Projects="$(SharedFrameworkPkgprojFile)" Targets="GetPackageIdentity" RemoveProperties="Configuration"> - + - $(SharedFrameworkLayoutDir)%(PackageReference.Identity)/%(PackageReference.Version)/ + %(SfxIdentity.Identity) + %(SfxIdentity.Version) + $(SharedFrameworkLayoutDir)shared/$(SfxIdentity)/$(SfxVersion)/ + + + + + + + + + + + + + + + @@ -120,11 +148,43 @@ + + + + + + Microsoft.NETCore.App.Insertion + $(PackageSymbolsBinDir)$(CrossgennedPackageId)/ + + + + + + + + + + + + + + + + @@ -137,8 +197,22 @@ linux + + + + + + + + + + diff --git a/src/pkg/packaging-tools/windows/sharedFramework/breadcrumbstorefolder.wxs b/src/pkg/packaging-tools/windows/sharedFramework/breadcrumbstorefolder.wxs new file mode 100644 index 0000000000..006303058b --- /dev/null +++ b/src/pkg/packaging-tools/windows/sharedFramework/breadcrumbstorefolder.wxs @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/pkg/packaging-tools/windows/sharedFramework/product.wxs b/src/pkg/packaging-tools/windows/sharedFramework/product.wxs index 907ffd4cb9..93396d5ada 100644 --- a/src/pkg/packaging-tools/windows/sharedFramework/product.wxs +++ b/src/pkg/packaging-tools/windows/sharedFramework/product.wxs @@ -16,6 +16,14 @@ + + + + + + + + diff --git a/src/pkg/packaging-tools/windows/sharedFramework/werrelatedkeys.wxs b/src/pkg/packaging-tools/windows/sharedFramework/werrelatedkeys.wxs new file mode 100644 index 0000000000..997df3d42b --- /dev/null +++ b/src/pkg/packaging-tools/windows/sharedFramework/werrelatedkeys.wxs @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/pkg/packaging-tools/windows/wix.targets b/src/pkg/packaging-tools/windows/wix.targets index fd96a7b29c..3640e13b2d 100644 --- a/src/pkg/packaging-tools/windows/wix.targets +++ b/src/pkg/packaging-tools/windows/wix.targets @@ -34,7 +34,7 @@ + + + + + + + + + + @@ -79,6 +89,10 @@ GetWixBuildConfiguration; GetUpgradeCode; GenerateMsiVersionString"> + + + + <_wixArgs> <_wixArgs>$(_wixArgs) -nologo @@ -93,7 +107,7 @@ <_wixArgs>$(_wixArgs) -dTargetArchitecture="$(TargetArchitecture)" <_wixArgs>$(_wixArgs) -dUpgradeCode="$(UpgradeCode)" <_wixArgs>$(_wixArgs) -dDependencyKeyName="$(InstallerName.Replace('-', '_'))" - <_wixArgs>$(_wixArgs) @(DirectoryToHarvest -> '-d%(SubstituteVar)="%(Identity)', ' ')" + <_wixArgs>$(_wixArgs) @(CandleVariables -> '-d%(Identity)="%(Value)"', ' ') <_wixArgs>$(_wixArgs) @(WixSrcFile -> '"%(Identity)"', ' ') <_wixArgs>$(_wixArgs) @(DirectoryToHarvest -> '"%(WixSourceFile)"', ' ') diff --git a/src/pkg/packaging/windows/package.targets b/src/pkg/packaging/windows/package.targets index 7f8398d0bf..dbd31dd43a 100644 --- a/src/pkg/packaging/windows/package.targets +++ b/src/pkg/packaging/windows/package.targets @@ -26,30 +26,17 @@ $(HostFxrInstallerFile) $(HostFxrUpgradeCode) - - - $(SharedFrameworkPublishRoot) - $(SharedFrameworkBrandName) - $(SharedFrameworkInstallerFile) - - - - - "$(MsiArch)" "$(TargetArchitecture)" $(MsiVersionString) $(SharedFrameworkNugetVersion) $(ArchParams) - $(MsiVersionString) $(SharedFrameworkName) $(SharedFrameworkNugetVersion) $(SharedFxUpgradeCode) $(ArchParams) - - - - - - - - - - diff --git a/src/pkg/packaging/windows/sharedframework/registrykeys.wxs b/src/pkg/packaging/windows/sharedframework/registrykeys.wxs deleted file mode 100644 index bcf20c2320..0000000000 --- a/src/pkg/packaging/windows/sharedframework/registrykeys.wxs +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/pkg/packaging/windows/sharedframework/sharedframework.wxs b/src/pkg/packaging/windows/sharedframework/sharedframework.wxs deleted file mode 100644 index 2e7c14e15a..0000000000 --- a/src/pkg/packaging/windows/sharedframework/sharedframework.wxs +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/pkg/projects/descriptions.json b/src/pkg/projects/descriptions.json index 2461aedc16..1694ff775e 100644 --- a/src/pkg/projects/descriptions.json +++ b/src/pkg/projects/descriptions.json @@ -39,6 +39,11 @@ "Description": "A set of .NET APIs that are included in the default .NET Core application model.", "CommonTypes": [ ] }, + { + "Name": "Microsoft.NETCore.App.Insertion", + "Description": "Transport package for .NET Core App runtime assets.", + "CommonTypes": [ ] + }, { "Name": "Microsoft.NETCore.App.Ref", "Description": "A set of .NET APIs that are included in the default .NET Core application model. Contains reference assemblies, documentation, and other design-time assets.", diff --git a/src/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Insertion.pkgproj b/src/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Insertion.pkgproj new file mode 100644 index 0000000000..9880edc418 --- /dev/null +++ b/src/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Insertion.pkgproj @@ -0,0 +1,25 @@ + + + + + + true + build/$(NETCoreAppFramework) + $(BuildTargetPath) + $(BuildTargetPath) + + + + + + + + + + $(HostPolicyVersion) + $(NETCoreAppFramework) + + + + + diff --git a/src/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.pkgproj b/src/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.pkgproj index 087ffdb98c..200eb041c0 100644 --- a/src/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.pkgproj +++ b/src/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.pkgproj @@ -1,34 +1,53 @@ + + true + + - true - build/$(NETCoreAppFramework) - $(BuildTargetPath) - $(BuildTargetPath) + + false + false - true + + true - - false - + false - - - - + true + true + + + $(SharedFrameworkInstallerFile) - - - $(HostPolicyVersion) - $(NETCoreAppFramework) - + + $(SharedFrameworkPublishDir) - - $(BuildTargetPath) - + + true + true + + + + + + + + + + + + diff --git a/src/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.targets b/src/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.targets deleted file mode 100644 index 48d6da603f..0000000000 --- a/src/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.targets +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - <_netCoreAppPackageDependencies - Include="@(PackageDependencies->WithMetadataValue('ParentPackage', '$(MSBuildThisFileName)/$(_Microsoft_NETCore_App_Version)'))" /> - <_activeRIDNetCoreAppPackageDependencies - Include="@(_netCoreAppPackageDependencies->WithMetadataValue('ParentTarget', '$(NuGetTargetMoniker)/$(RuntimeIdentifier)'))" /> - <_activeTFMNetCoreAppPackageDependencies - Include="@(_netCoreAppPackageDependencies->WithMetadataValue('ParentTarget', '$(NuGetTargetMoniker)'))" /> - <_ridSpecificNetCoreAppPackageDependencies - Include="@(_activeRIDNetCoreAppPackageDependencies)" - Exclude="@(_activeTFMNetCoreAppPackageDependencies)" /> - - - - - \ No newline at end of file diff --git a/src/pkg/projects/netcoreapp/pkg/dir.props b/src/pkg/projects/netcoreapp/pkg/dir.props index 3d64106c0b..cd54021e20 100644 --- a/src/pkg/projects/netcoreapp/pkg/dir.props +++ b/src/pkg/projects/netcoreapp/pkg/dir.props @@ -15,7 +15,7 @@ - + NuGetRuntimeIdentifier=$(PackageTargetRuntime) diff --git a/src/sharedFramework/framework/Program.cs b/src/sharedFramework/framework/Program.cs deleted file mode 100644 index 4aa370b90e..0000000000 --- a/src/sharedFramework/framework/Program.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; - -namespace ConsoleApplication -{ - public class Program - { - public static void Main(string[] args) - { - } - } -} \ No newline at end of file diff --git a/src/sharedFramework/framework/framework.csproj b/src/sharedFramework/framework/framework.csproj deleted file mode 100644 index 52e6553de6..0000000000 --- a/src/sharedFramework/framework/framework.csproj +++ /dev/null @@ -1,7 +0,0 @@ - - - - Exe - - - diff --git a/src/sharedFramework/lockedhost/lockedhost.csproj b/src/sharedFramework/lockedhost/lockedhost.csproj deleted file mode 100644 index 38785134f5..0000000000 --- a/src/sharedFramework/lockedhost/lockedhost.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - false - true - false - false - 2008;8021 - - - - - - - - diff --git a/src/sharedFramework/sharedFramework.proj b/src/sharedFramework/sharedFramework.proj deleted file mode 100644 index 67824808a7..0000000000 --- a/src/sharedFramework/sharedFramework.proj +++ /dev/null @@ -1,165 +0,0 @@ - - - - - - - - - - - - PublishSharedFrameworkAndSharedHost; - GenerateRuntimeGraph; - CopyHostArtifactsToSharedFramework; - GenerateVersionFile; - - - - - $(MSBuildPassThroughPropertyList) /p:TargetFramework=$(NETCoreAppFramework) /p:RuntimeIdentifier=$(PackageTargetRid) - - - $(IntermediateOutputRootPath)SFP.packages\ - $(SharedFrameworkPublishDir)shared\$(SharedFrameworkName)\$(SharedFrameworkNugetVersion) - - - - - - - - $(MSBuildThisFileDirectory)framework - $(CommonProjectArgs) /p:RuntimeFrameworkVersion=$(SharedFrameworkNugetVersion) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(IntermediateOutputRootPath)/framework/project.assets.json - $(SharedFrameworkNameAndVersionRoot)\$(SharedFrameworkName).deps.json - win - osx - freebsd - linux - - - - - - - - - - - - - - - $(MSBuildThisFileDirectory)lockedhost - $(CommonProjectArgs) /p:HostResolverVersion=$(HostResolverVersion) /p:HostVersion=$(HostVersion) - - - - - - - - - - - From 20e14d6d206351989291fe1ea2f3f76adcf75ef7 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Tue, 16 Apr 2019 16:22:26 -0500 Subject: [PATCH 2/5] Test workarounds for Msft.NETCore.App.Insertion If tests use MNA, use MNAI. --- TestProjects.props | 1 + .../Assets/TestProjects/Directory.Build.props | 4 ++ .../MNADeprecationWorkaround.props | 18 ++++++ .../PortableApp/PortableApp.csproj | 62 ++++++++++++++++++- .../StandaloneApp20/Directory.Build.props | 10 +++ .../StandaloneApp21/Directory.Build.props | 10 +++ 6 files changed, 104 insertions(+), 1 deletion(-) create mode 100644 src/test/Assets/TestProjects/Directory.Build.props create mode 100644 src/test/Assets/TestProjects/MNADeprecationWorkaround.props create mode 100644 src/test/Assets/TestProjects/StandaloneApp20/Directory.Build.props create mode 100644 src/test/Assets/TestProjects/StandaloneApp21/Directory.Build.props diff --git a/TestProjects.props b/TestProjects.props index 72f14516c2..f31d060396 100644 --- a/TestProjects.props +++ b/TestProjects.props @@ -1,3 +1,4 @@ + \ No newline at end of file diff --git a/src/test/Assets/TestProjects/Directory.Build.props b/src/test/Assets/TestProjects/Directory.Build.props new file mode 100644 index 0000000000..da5bb1986b --- /dev/null +++ b/src/test/Assets/TestProjects/Directory.Build.props @@ -0,0 +1,4 @@ + + + + diff --git a/src/test/Assets/TestProjects/MNADeprecationWorkaround.props b/src/test/Assets/TestProjects/MNADeprecationWorkaround.props new file mode 100644 index 0000000000..9817418625 --- /dev/null +++ b/src/test/Assets/TestProjects/MNADeprecationWorkaround.props @@ -0,0 +1,18 @@ + + + + + true + + + + + + + diff --git a/src/test/Assets/TestProjects/PortableApp/PortableApp.csproj b/src/test/Assets/TestProjects/PortableApp/PortableApp.csproj index 83efdd4f11..34f9c9c798 100644 --- a/src/test/Assets/TestProjects/PortableApp/PortableApp.csproj +++ b/src/test/Assets/TestProjects/PortableApp/PortableApp.csproj @@ -1,4 +1,6 @@ - + + + $(NETCoreAppFramework) @@ -10,4 +12,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/Assets/TestProjects/StandaloneApp20/Directory.Build.props b/src/test/Assets/TestProjects/StandaloneApp20/Directory.Build.props new file mode 100644 index 0000000000..328a1969db --- /dev/null +++ b/src/test/Assets/TestProjects/StandaloneApp20/Directory.Build.props @@ -0,0 +1,10 @@ + + + + + false + + + + + diff --git a/src/test/Assets/TestProjects/StandaloneApp21/Directory.Build.props b/src/test/Assets/TestProjects/StandaloneApp21/Directory.Build.props new file mode 100644 index 0000000000..328a1969db --- /dev/null +++ b/src/test/Assets/TestProjects/StandaloneApp21/Directory.Build.props @@ -0,0 +1,10 @@ + + + + + false + + + + + From 9a136bda6ccbfb1906bae47b7c61da824ff41dd6 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Wed, 17 Apr 2019 12:47:22 -0500 Subject: [PATCH 3/5] M.NETCore.App.Insertion => M.NETCore.App.Internal It isn't just for insertion into core-sdk, we use it in core-setup too for now. --- .../sharedFramework/sharedFramework.csproj | 4 ++-- src/pkg/projects/descriptions.json | 2 +- ...ion.pkgproj => Microsoft.NETCore.App.Internal.pkgproj} | 0 .../projects/netcoreapp/pkg/Microsoft.NETCore.App.pkgproj | 4 ++-- .../Assets/TestProjects/MNADeprecationWorkaround.props | 8 ++++---- .../Assets/TestProjects/PortableApp/PortableApp.csproj | 2 +- .../TestProjects/StandaloneApp20/Directory.Build.props | 2 +- .../TestProjects/StandaloneApp21/Directory.Build.props | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) rename src/pkg/projects/netcoreapp/pkg/{Microsoft.NETCore.App.Insertion.pkgproj => Microsoft.NETCore.App.Internal.pkgproj} (100%) diff --git a/src/pkg/packaging-tools/sharedFramework/sharedFramework.csproj b/src/pkg/packaging-tools/sharedFramework/sharedFramework.csproj index cfb52b90d8..d7587e4979 100644 --- a/src/pkg/packaging-tools/sharedFramework/sharedFramework.csproj +++ b/src/pkg/packaging-tools/sharedFramework/sharedFramework.csproj @@ -160,10 +160,10 @@ AfterTargets="Publish"> - Microsoft.NETCore.App.Insertion + Microsoft.NETCore.App.Internal $(PackageSymbolsBinDir)$(CrossgennedPackageId)/ diff --git a/src/pkg/projects/descriptions.json b/src/pkg/projects/descriptions.json index 1694ff775e..a1655af66e 100644 --- a/src/pkg/projects/descriptions.json +++ b/src/pkg/projects/descriptions.json @@ -40,7 +40,7 @@ "CommonTypes": [ ] }, { - "Name": "Microsoft.NETCore.App.Insertion", + "Name": "Microsoft.NETCore.App.Internal", "Description": "Transport package for .NET Core App runtime assets.", "CommonTypes": [ ] }, diff --git a/src/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Insertion.pkgproj b/src/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Internal.pkgproj similarity index 100% rename from src/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Insertion.pkgproj rename to src/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Internal.pkgproj diff --git a/src/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.pkgproj b/src/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.pkgproj index 200eb041c0..c17657083c 100644 --- a/src/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.pkgproj +++ b/src/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.pkgproj @@ -40,13 +40,13 @@ - + diff --git a/src/test/Assets/TestProjects/MNADeprecationWorkaround.props b/src/test/Assets/TestProjects/MNADeprecationWorkaround.props index 9817418625..4ed66ef229 100644 --- a/src/test/Assets/TestProjects/MNADeprecationWorkaround.props +++ b/src/test/Assets/TestProjects/MNADeprecationWorkaround.props @@ -2,17 +2,17 @@ - true + true - - + + diff --git a/src/test/Assets/TestProjects/PortableApp/PortableApp.csproj b/src/test/Assets/TestProjects/PortableApp/PortableApp.csproj index 34f9c9c798..b4ea72efa7 100644 --- a/src/test/Assets/TestProjects/PortableApp/PortableApp.csproj +++ b/src/test/Assets/TestProjects/PortableApp/PortableApp.csproj @@ -40,7 +40,7 @@ Properties="RestoreGraphProjectInput=$(MSBuildProjectFullPath); DisableImplicitFrameworkReferences=true; RestoreOutputPath=$(_CrossProjFileDir); - StorePackageName=Microsoft.NETCore.App.Insertion; + StorePackageName=Microsoft.NETCore.App.Internal; StorePackageVersion=$(RuntimeFrameworkVersion);"/> - false + false diff --git a/src/test/Assets/TestProjects/StandaloneApp21/Directory.Build.props b/src/test/Assets/TestProjects/StandaloneApp21/Directory.Build.props index 328a1969db..15b300069c 100644 --- a/src/test/Assets/TestProjects/StandaloneApp21/Directory.Build.props +++ b/src/test/Assets/TestProjects/StandaloneApp21/Directory.Build.props @@ -2,7 +2,7 @@ - false + false From 842ba1d2663e55b5418af2627e6321afcc5a63a9 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 22 Apr 2019 09:19:32 -0500 Subject: [PATCH 4/5] Update dir.props: quote '/' and '\' in comment Co-Authored-By: dagood --- dir.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dir.props b/dir.props index d6d085c862..5044d08104 100644 --- a/dir.props +++ b/dir.props @@ -276,7 +276,7 @@ $(PackageOutputPath) $(PackagesBasePath)symbols/ - + $(IntermediateOutputRootPath)sharedFrameworkPublish/ $(IntermediateOutputRootPath)sharedFrameworkPublish.symbols\ From 8986bb93a0b2377908fe1a446ec6683add560d5d Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Mon, 22 Apr 2019 09:34:56 -0500 Subject: [PATCH 5/5] Comment on explicit .lib exclusion --- .../packaging-tools/sharedFramework/sharedFramework.csproj | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/pkg/packaging-tools/sharedFramework/sharedFramework.csproj b/src/pkg/packaging-tools/sharedFramework/sharedFramework.csproj index d7587e4979..b686e4d2c3 100644 --- a/src/pkg/packaging-tools/sharedFramework/sharedFramework.csproj +++ b/src/pkg/packaging-tools/sharedFramework/sharedFramework.csproj @@ -148,6 +148,13 @@ +