From 5f4eb5cbbdd7f0a80d0ac7c4c2bacc4612ed801c Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Thu, 20 Apr 2017 08:39:47 -0700 Subject: [PATCH] Package *.HostingStartup.deps.json files as part of package cache build (#34) --- MetaPackages.sln | 9 +- build/common.props | 142 ++++++++++++++++++ build/repo.props | 5 + build/repo.targets | 17 ++- .../Microsoft.AspNetCore.All.csproj | 135 +---------------- .../Microsoft.AspNetCore.RuntimeStore.csproj | 20 +++ .../Microsoft.AspNetCore.csproj | 13 +- 7 files changed, 189 insertions(+), 152 deletions(-) create mode 100644 build/repo.props create mode 100644 src/Microsoft.AspNetCore.RuntimeStore/Microsoft.AspNetCore.RuntimeStore.csproj diff --git a/MetaPackages.sln b/MetaPackages.sln index a44e361e0a..c5c63d90c3 100644 --- a/MetaPackages.sln +++ b/MetaPackages.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26323.1 +VisualStudioVersion = 15.0.26412.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED834E68-51C3-4ADE-ACC8-6BA6D4207C09}" EndProject @@ -20,6 +20,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{F92CB7A1 build\repo.targets = build\repo.targets EndProjectSection EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.RuntimeStore", "src\Microsoft.AspNetCore.RuntimeStore\Microsoft.AspNetCore.RuntimeStore.csproj", "{A4585E19-FC49-43B4-9416-0BD3120EAD32}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -34,6 +36,10 @@ Global {CC8F551E-213A-45E8-AECA-507C4DB4F164}.Debug|Any CPU.Build.0 = Debug|Any CPU {CC8F551E-213A-45E8-AECA-507C4DB4F164}.Release|Any CPU.ActiveCfg = Release|Any CPU {CC8F551E-213A-45E8-AECA-507C4DB4F164}.Release|Any CPU.Build.0 = Release|Any CPU + {A4585E19-FC49-43B4-9416-0BD3120EAD32}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A4585E19-FC49-43B4-9416-0BD3120EAD32}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A4585E19-FC49-43B4-9416-0BD3120EAD32}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A4585E19-FC49-43B4-9416-0BD3120EAD32}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -42,5 +48,6 @@ Global {6F3D43F7-9546-4B41-AF04-CF4708B62051} = {ED834E68-51C3-4ADE-ACC8-6BA6D4207C09} {CC8F551E-213A-45E8-AECA-507C4DB4F164} = {ED834E68-51C3-4ADE-ACC8-6BA6D4207C09} {F92CB7A1-C38E-408C-A7EC-A5C040D041E1} = {97D53BEB-A511-4FBE-B784-AB407D9A219F} + {A4585E19-FC49-43B4-9416-0BD3120EAD32} = {ED834E68-51C3-4ADE-ACC8-6BA6D4207C09} EndGlobalSection EndGlobal diff --git a/build/common.props b/build/common.props index 714e11e12c..3bef86b4cd 100644 --- a/build/common.props +++ b/build/common.props @@ -20,5 +20,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/repo.props b/build/repo.props new file mode 100644 index 0000000000..c7b2520845 --- /dev/null +++ b/build/repo.props @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/build/repo.targets b/build/repo.targets index f79428cca4..9f7e31a399 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -2,10 +2,11 @@ - $(RepositoryRoot)src\Microsoft.AspNetCore.All\ - $(MetaPackagePath)Microsoft.AspNetCore.All.csproj + $(RepositoryRoot)src\Microsoft.AspNetCore.RuntimeStore\ + $(MetaPackagePath)Microsoft.AspNetCore.RuntimeStore.csproj $(MetaPackagePath)bin\work\ $(MetaPackagePath)bin\packageCache\ + $(MetaPackagePath)bin\deps\ $(RepositoryRoot)artifacts\ $(ArtifactsDir)temp\ $(RepositoryRoot)tools\ @@ -35,9 +36,12 @@ - $(ArtifactsDir)Build.RuntimeStore.win-$(VersionSuffix).zip - $(ArtifactsDir)Build.RuntimeStore.linux-$(VersionSuffix).zip - $(ArtifactsDir)Build.RuntimeStore.osx-$(VersionSuffix).zip + win + linux + osx + + $(ArtifactsDir)Build.RuntimeStore.$(OutputZipSufix)-$(VersionSuffix).zip + $(ArtifactsDir)Build.Deps.$(OutputZipSufix)-$(VersionSuffix).zip @@ -59,14 +63,17 @@ + manifest.%(RIDs.Identity).xml + + diff --git a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj index 5a9ac58b14..3f4f051db9 100644 --- a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj +++ b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj @@ -11,141 +11,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - diff --git a/src/Microsoft.AspNetCore.RuntimeStore/Microsoft.AspNetCore.RuntimeStore.csproj b/src/Microsoft.AspNetCore.RuntimeStore/Microsoft.AspNetCore.RuntimeStore.csproj new file mode 100644 index 0000000000..6331331da8 --- /dev/null +++ b/src/Microsoft.AspNetCore.RuntimeStore/Microsoft.AspNetCore.RuntimeStore.csproj @@ -0,0 +1,20 @@ + + + + + + netcoreapp2.0 + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj b/src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj index 22ff45b49a..1299f3569e 100644 --- a/src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj +++ b/src/Microsoft.AspNetCore/Microsoft.AspNetCore.csproj @@ -10,18 +10,7 @@ - - - - - - - - - - - - +