From 1f39e07909276677fb8c7f5c34443a0996353f30 Mon Sep 17 00:00:00 2001 From: Justin Goshi Date: Wed, 22 Feb 2017 16:19:56 -0800 Subject: [PATCH 1/9] Refactor props from publish directory --- build/publish/Badge.targets | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/publish/Badge.targets b/build/publish/Badge.targets index 4d1dc7ef6..7c87a7ac6 100644 --- a/build/publish/Badge.targets +++ b/build/publish/Badge.targets @@ -1,11 +1,11 @@ + + $(RepoRoot)/resources/images/version_badge.svg + + - - $(RepoRoot)/resources/images/version_badge.svg - - Date: Wed, 22 Feb 2017 00:00:36 -0800 Subject: [PATCH 2/9] RootProject property --- build/InputFiles.props | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 build/InputFiles.props diff --git a/build/InputFiles.props b/build/InputFiles.props new file mode 100644 index 000000000..aa7a87ea2 --- /dev/null +++ b/build/InputFiles.props @@ -0,0 +1,5 @@ + + + $(SrcDirectory)/redist/redist.csproj + + \ No newline at end of file From 5a89b0145926c7c74a923785bd9b81e0dc7fa273 Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Wed, 22 Feb 2017 00:46:59 -0800 Subject: [PATCH 3/9] Remove HackFilesToCopy --- build/Compile.targets | 10 ---------- src/redist/redist.csproj | 4 +++- src/tool_msbuild/tool_msbuild.csproj | 4 +++- src/tool_roslyn/tool_roslyn.csproj | 15 +++------------ 4 files changed, 9 insertions(+), 24 deletions(-) diff --git a/build/Compile.targets b/build/Compile.targets index ef6b9c35f..010407c50 100644 --- a/build/Compile.targets +++ b/build/Compile.targets @@ -36,16 +36,6 @@ - - - - - - - + + ContentFiles + diff --git a/src/tool_msbuild/tool_msbuild.csproj b/src/tool_msbuild/tool_msbuild.csproj index af6b13ecb..80dc8a3d6 100644 --- a/src/tool_msbuild/tool_msbuild.csproj +++ b/src/tool_msbuild/tool_msbuild.csproj @@ -7,6 +7,8 @@ - + + ContentFiles + \ No newline at end of file diff --git a/src/tool_roslyn/tool_roslyn.csproj b/src/tool_roslyn/tool_roslyn.csproj index 75a94c454..9923c16ae 100644 --- a/src/tool_roslyn/tool_roslyn.csproj +++ b/src/tool_roslyn/tool_roslyn.csproj @@ -11,7 +11,9 @@ - + + ContentFiles + @@ -22,17 +24,6 @@ PreserveNewest - - - - - - - - - Date: Wed, 22 Feb 2017 00:54:01 -0800 Subject: [PATCH 4/9] Fix spacing --- build/Compile.targets | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/build/Compile.targets b/build/Compile.targets index 010407c50..f5518155d 100644 --- a/build/Compile.targets +++ b/build/Compile.targets @@ -16,25 +16,25 @@ GetNuGetPackagesArchive;" /> - - - + + + - - + + - - - - - + + + + + - - + + - - + + Date: Wed, 22 Feb 2017 00:56:29 -0800 Subject: [PATCH 5/9] add back Roslyn tasks --- src/tool_roslyn/tool_roslyn.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tool_roslyn/tool_roslyn.csproj b/src/tool_roslyn/tool_roslyn.csproj index 9923c16ae..c0ebe5e95 100644 --- a/src/tool_roslyn/tool_roslyn.csproj +++ b/src/tool_roslyn/tool_roslyn.csproj @@ -12,7 +12,7 @@ - ContentFiles + ContentFiles;Compile From 4d0dbdbb7f578dedcf7254024636f497902708e7 Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Wed, 22 Feb 2017 17:05:49 -0800 Subject: [PATCH 6/9] Cleanup --- build/InputFiles.props | 5 ----- src/redist/redist.csproj | 4 +--- src/tool_msbuild/tool_msbuild.csproj | 6 ++---- src/tool_roslyn/tool_roslyn.csproj | 4 +--- 4 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 build/InputFiles.props diff --git a/build/InputFiles.props b/build/InputFiles.props deleted file mode 100644 index aa7a87ea2..000000000 --- a/build/InputFiles.props +++ /dev/null @@ -1,5 +0,0 @@ - - - $(SrcDirectory)/redist/redist.csproj - - \ No newline at end of file diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 91aedd23c..4cb38d156 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -15,9 +15,7 @@ - - ContentFiles - + diff --git a/src/tool_msbuild/tool_msbuild.csproj b/src/tool_msbuild/tool_msbuild.csproj index 80dc8a3d6..54bd40c4c 100644 --- a/src/tool_msbuild/tool_msbuild.csproj +++ b/src/tool_msbuild/tool_msbuild.csproj @@ -7,8 +7,6 @@ - - ContentFiles - + - \ No newline at end of file + diff --git a/src/tool_roslyn/tool_roslyn.csproj b/src/tool_roslyn/tool_roslyn.csproj index c0ebe5e95..001f554ad 100644 --- a/src/tool_roslyn/tool_roslyn.csproj +++ b/src/tool_roslyn/tool_roslyn.csproj @@ -11,9 +11,7 @@ - - ContentFiles;Compile - + From 31f2410b4f99a4983944e921ab54716df308adf9 Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Wed, 22 Feb 2017 17:33:26 -0800 Subject: [PATCH 7/9] Enable Publishing Roslyn with Static Output Path --- build/Compile.targets | 2 -- build/OutputDirectories.props | 1 + src/tool_roslyn/tool_roslyn.csproj | 3 +++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build/Compile.targets b/build/Compile.targets index ef6b9c35f..8f85f1763 100644 --- a/build/Compile.targets +++ b/build/Compile.targets @@ -53,9 +53,7 @@ $(BaseOutputDirectory)/stage2 $(BaseOutputDirectory)/stage2symbols $(Stage2Directory)/sdk/$(SdkVersion) + $(Stage2SdkDirectory)/Roslyn $(Stage2Directory)/dotnet$(ExeExtension) $(Stage2Directory)/ $(BaseOutputDirectory)/stage2compilation diff --git a/src/tool_roslyn/tool_roslyn.csproj b/src/tool_roslyn/tool_roslyn.csproj index 75a94c454..a252eaebb 100644 --- a/src/tool_roslyn/tool_roslyn.csproj +++ b/src/tool_roslyn/tool_roslyn.csproj @@ -7,7 +7,10 @@ netcoreapp2.0 $(CLI_SharedFrameworkVersion) true + $(Stage2RoslynDirectory) + $(CommitCount) + From 1199df1c05590e3bde914cccd9a8bcea993e599a Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Wed, 22 Feb 2017 22:44:52 -0800 Subject: [PATCH 8/9] Move tool deps file creation into redist.csproj --- Microsoft.DotNet.Cli.sln | 3 ++- build/BundledTools.props | 11 +++++++++++ build/Compile.targets | 28 ---------------------------- dir.props | 1 + src/redist/redist.csproj | 26 +++++++++++++++++++++++++- src/tool_msbuild/tool_msbuild.csproj | 2 ++ src/tool_nuget/tool_nuget.csproj | 2 ++ 7 files changed, 43 insertions(+), 30 deletions(-) create mode 100644 build/BundledTools.props diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln index f174ad207..9fa2244f7 100644 --- a/Microsoft.DotNet.Cli.sln +++ b/Microsoft.DotNet.Cli.sln @@ -28,11 +28,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4 build\BranchInfo.props = build\BranchInfo.props build\BuildDefaults.props = build\BuildDefaults.props build\BuildOutputs.props = build\BuildOutputs.props - build\BundledSdks.proj = build\BundledSdks.proj build\BundledRuntimes.props = build\BundledRuntimes.props + build\BundledSdks.proj = build\BundledSdks.proj build\BundledSdks.props = build\BundledSdks.props build\BundledTemplates.proj = build\BundledTemplates.proj build\BundledTemplates.props = build\BundledTemplates.props + build\BundledTools.props = build\BundledTools.props build\Compile.targets = build\Compile.targets build\CoreSetupInfo.props = build\CoreSetupInfo.props build\CrossgenInfo.props = build\CrossgenInfo.props diff --git a/build/BundledTools.props b/build/BundledTools.props new file mode 100644 index 000000000..b57577824 --- /dev/null +++ b/build/BundledTools.props @@ -0,0 +1,11 @@ + + + + + + + \ No newline at end of file diff --git a/build/Compile.targets b/build/Compile.targets index c1be8f877..861cc1dc3 100644 --- a/build/Compile.targets +++ b/build/Compile.targets @@ -4,7 +4,6 @@ - @@ -19,14 +18,6 @@ - - - - - - - - @@ -46,25 +37,6 @@ Configuration="$(Configuration)" ProjectPath="$(SrcDirectory)/tool_roslyn/tool_roslyn.csproj" /> - - - - - - - - - - - - - diff --git a/dir.props b/dir.props index 25be13d42..144c12123 100644 --- a/dir.props +++ b/dir.props @@ -11,6 +11,7 @@ + diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj index 4cb38d156..463fffcd6 100644 --- a/src/redist/redist.csproj +++ b/src/redist/redist.csproj @@ -1,11 +1,13 @@  + $(CliVersionPrefix) netcoreapp2.0 $(CLI_SharedFrameworkVersion) true + false $(PackageTargetFallback);dotnet5.4 $(Stage2SdkDirectory) $(CommitCount) @@ -18,6 +20,7 @@ + @@ -30,4 +33,25 @@ - \ No newline at end of file + + + + + + + + + + + + + diff --git a/src/tool_msbuild/tool_msbuild.csproj b/src/tool_msbuild/tool_msbuild.csproj index 54bd40c4c..62ce1e4e5 100644 --- a/src/tool_msbuild/tool_msbuild.csproj +++ b/src/tool_msbuild/tool_msbuild.csproj @@ -4,6 +4,8 @@ $(CliVersionPrefix) $(CliTargetFramework) + false + false diff --git a/src/tool_nuget/tool_nuget.csproj b/src/tool_nuget/tool_nuget.csproj index 3f7a61c1e..19ff7b73e 100644 --- a/src/tool_nuget/tool_nuget.csproj +++ b/src/tool_nuget/tool_nuget.csproj @@ -4,6 +4,8 @@ $(CliVersionPrefix) $(CliTargetFramework) + false + false From 7818348fc28c39b551cf107686a1b3d23ca002b0 Mon Sep 17 00:00:00 2001 From: Piotr Puszkiewicz Date: Thu, 23 Feb 2017 01:12:32 -0800 Subject: [PATCH 9/9] Move copying sharedfx to before publish of redist --- build/Compile.targets | 9 --------- src/redist/redist.csproj | 11 +++++++++++ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/build/Compile.targets b/build/Compile.targets index 861cc1dc3..7e0c09663 100644 --- a/build/Compile.targets +++ b/build/Compile.targets @@ -15,18 +15,9 @@ GetNuGetPackagesArchive;" /> - - - - - - - - + + + + + + + + +