diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.props b/src/SourceBuild/content/repo-projects/Directory.Build.props index 252aef141..a9546d9bc 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.props +++ b/src/SourceBuild/content/repo-projects/Directory.Build.props @@ -29,6 +29,12 @@ $(IntermediatePath)PackageVersions.$(RepositoryName).Snapshot.props $(IntermediatePath)PackageVersions.$(RepositoryName).props AllPackages + + $(ProjectDirectory)eng/common/tools.sh + $(ProjectDirectory)eng/common/build.sh + $(ProjectDirectory)global.json + $(ProjectDirectory)NuGet.config + $(ProjectDirectory)NuGet.Config @@ -167,4 +173,9 @@ + + + + + diff --git a/src/SourceBuild/content/repo-projects/Directory.Build.targets b/src/SourceBuild/content/repo-projects/Directory.Build.targets index 6bc3d017d..3cbe99cc0 100644 --- a/src/SourceBuild/content/repo-projects/Directory.Build.targets +++ b/src/SourceBuild/content/repo-projects/Directory.Build.targets @@ -17,45 +17,6 @@ - - - true - $(ProjectDirectory)/eng/common/tools.sh - $(ProjectDirectory)/eng/common/build.sh - - - - $(RepoApiImplemented) - $(RepoApiImplemented) - $(RepoApiImplemented) - - - - $(ProjectDirectory)NuGet.config - $(ProjectDirectory)NuGet.Config - $(ProjectDirectory)src\NuGet.config - $(ProjectDirectory)src\NuGet.Config - - - - - $(RepoApiArgs) /p:DotNetPackageVersionPropsPath=$(PackageVersionPropsPath) - - - - $(RepoApiArgs) /p:DotNetBuildOffline=true - - - - $(RepoApiArgs) /p:DotNetOutputBlobFeedDir=$(SourceBuiltBlobFeedDir) - - @@ -97,7 +58,6 @@ NewText="$(NewText)" /> - - + @@ -293,8 +253,8 @@ - $(BuildCommand) /v:$(LogVerbosity) $(RepoApiArgs) $(RedirectRepoOutputToLog) - $(BuildCommand) $(RepoApiArgs) $(RedirectRepoOutputToLog) + $(BuildCommand) /v:$(LogVerbosity) $(RedirectRepoOutputToLog) + $(BuildCommand) $(RedirectRepoOutputToLog) diff --git a/src/SourceBuild/content/repo-projects/arcade.proj b/src/SourceBuild/content/repo-projects/arcade.proj index ae90ac3c7..c3c7ea078 100644 --- a/src/SourceBuild/content/repo-projects/arcade.proj +++ b/src/SourceBuild/content/repo-projects/arcade.proj @@ -6,21 +6,12 @@ $(BuildCommandArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg) $(StandardSourceBuildCommand) $(BuildCommandArgs) - - $(ProjectDirectory)NuGet.config - - $(ProjectDirectory)global.json - - true - false - true true - diff --git a/src/SourceBuild/content/repo-projects/aspnetcore.proj b/src/SourceBuild/content/repo-projects/aspnetcore.proj index 2ede39318..abd2b580e 100644 --- a/src/SourceBuild/content/repo-projects/aspnetcore.proj +++ b/src/SourceBuild/content/repo-projects/aspnetcore.proj @@ -24,12 +24,6 @@ true - false - true - - $(ProjectDirectory)global.json - $(ProjectDirectory)NuGet.config - CS9057 @@ -18,9 +14,5 @@ - - - - diff --git a/src/SourceBuild/content/repo-projects/fsharp.proj b/src/SourceBuild/content/repo-projects/fsharp.proj index b1a23d341..25eeb3d9e 100644 --- a/src/SourceBuild/content/repo-projects/fsharp.proj +++ b/src/SourceBuild/content/repo-projects/fsharp.proj @@ -12,9 +12,6 @@ $(BuildCommandArgs) --sourcebuild $(StandardSourceBuildCommand) $(BuildCommandArgs) - false - $(ProjectDirectory)global.json - $(ProjectDirectory)NuGet.config true @@ -25,10 +22,6 @@ - - - - diff --git a/src/SourceBuild/content/repo-projects/installer.proj b/src/SourceBuild/content/repo-projects/installer.proj index 6713b700b..b368b83ec 100644 --- a/src/SourceBuild/content/repo-projects/installer.proj +++ b/src/SourceBuild/content/repo-projects/installer.proj @@ -43,20 +43,10 @@ $(StandardSourceBuildCommand) $(BuildCommandArgs) - false - true - true - - $(ProjectDirectory)NuGet.config - CS9057 - - - - diff --git a/src/SourceBuild/content/repo-projects/msbuild.proj b/src/SourceBuild/content/repo-projects/msbuild.proj index 58f840009..9dc993f2b 100644 --- a/src/SourceBuild/content/repo-projects/msbuild.proj +++ b/src/SourceBuild/content/repo-projects/msbuild.proj @@ -13,14 +13,6 @@ $(BuildCommandArgs) $(OutputVersionArgs) $(BuildCommandArgs) /p:DotNetCoreSdkDir=$(DotNetCliToolDir) $(StandardSourceBuildCommand) $(BuildCommandArgs) - - - $(ProjectDirectory)NuGet.config - - true - false - - $(ProjectDirectory)global.json @@ -43,7 +35,6 @@ --> - $(KeysDir)NuGet.Client.snk - false - true true CS9057 @@ -12,6 +10,7 @@ + @@ -24,5 +23,4 @@ - diff --git a/src/SourceBuild/content/repo-projects/package-source-build.proj b/src/SourceBuild/content/repo-projects/package-source-build.proj index ec607bfe0..ac30ad7a2 100644 --- a/src/SourceBuild/content/repo-projects/package-source-build.proj +++ b/src/SourceBuild/content/repo-projects/package-source-build.proj @@ -2,7 +2,6 @@ - false $(SubmoduleDirectory)$(RepositoryName)/ true $(CurrentSourceBuiltPackageVersionPropsPath) diff --git a/src/SourceBuild/content/repo-projects/razor.proj b/src/SourceBuild/content/repo-projects/razor.proj index a56aa1ea4..89cdd2b8d 100644 --- a/src/SourceBuild/content/repo-projects/razor.proj +++ b/src/SourceBuild/content/repo-projects/razor.proj @@ -4,10 +4,6 @@ $(StandardSourceBuildCommand) $(StandardSourceBuildArgs) - $(ProjectDirectory)global.json - $(ProjectDirectory)NuGet.config - false - NU1507 @@ -17,9 +13,5 @@ - - - - diff --git a/src/SourceBuild/content/repo-projects/roslyn-analyzers.proj b/src/SourceBuild/content/repo-projects/roslyn-analyzers.proj index 3c980eb65..c9869f517 100644 --- a/src/SourceBuild/content/repo-projects/roslyn-analyzers.proj +++ b/src/SourceBuild/content/repo-projects/roslyn-analyzers.proj @@ -6,10 +6,7 @@ $(BuildCommandArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg) $(StandardSourceBuildCommand) $(BuildCommandArgs) - false - false true - $(ProjectDirectory)global.json DependenciesOnly @@ -22,9 +19,5 @@ - - - - diff --git a/src/SourceBuild/content/repo-projects/roslyn.proj b/src/SourceBuild/content/repo-projects/roslyn.proj index f4e3b8095..078b23836 100644 --- a/src/SourceBuild/content/repo-projects/roslyn.proj +++ b/src/SourceBuild/content/repo-projects/roslyn.proj @@ -16,9 +16,7 @@ $(ProjectDirectory)build$(ShellExtension) $(BuildCommandArgs) - false true - $(ProjectDirectory)global.json @@ -30,7 +28,6 @@ - diff --git a/src/SourceBuild/content/repo-projects/runtime.proj b/src/SourceBuild/content/repo-projects/runtime.proj index e42eef565..d3058b5a5 100644 --- a/src/SourceBuild/content/repo-projects/runtime.proj +++ b/src/SourceBuild/content/repo-projects/runtime.proj @@ -27,17 +27,8 @@ $(StandardSourceBuildCommand) $(BuildCommandArgs) - - - $(ProjectDirectory)global.json - $(ProjectDirectory)NuGet.config - false - true - - - diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj index 5872f71fd..050dabf28 100644 --- a/src/SourceBuild/content/repo-projects/sdk.proj +++ b/src/SourceBuild/content/repo-projects/sdk.proj @@ -14,19 +14,8 @@ $(BuildCommandArgs) -v $(LogVerbosity) $(StandardSourceBuildCommand) $(BuildCommandArgs) - - - $(ProjectDirectory)NuGet.config - $(ProjectDirectory)global.json - - true - false - - - - diff --git a/src/SourceBuild/content/repo-projects/source-build-externals.proj b/src/SourceBuild/content/repo-projects/source-build-externals.proj index 07f094829..6f905da54 100644 --- a/src/SourceBuild/content/repo-projects/source-build-externals.proj +++ b/src/SourceBuild/content/repo-projects/source-build-externals.proj @@ -3,14 +3,7 @@ $(StandardSourceBuildCommand) $(StandardSourceBuildArgs) - - $(ProjectDirectory)NuGet.config - false - - - - diff --git a/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj b/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj index c1321e716..4c535e89c 100644 --- a/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj +++ b/src/SourceBuild/content/repo-projects/source-build-reference-packages.proj @@ -10,18 +10,10 @@ $(StandardSourceBuildCommand) $(BuildCommandArgs) - $(ProjectDirectory)NuGet.config - $(ProjectDirectory)global.json - false - true - - - - diff --git a/src/SourceBuild/content/repo-projects/sourcelink.proj b/src/SourceBuild/content/repo-projects/sourcelink.proj index f034ee76c..a048b6a1f 100644 --- a/src/SourceBuild/content/repo-projects/sourcelink.proj +++ b/src/SourceBuild/content/repo-projects/sourcelink.proj @@ -4,19 +4,12 @@ $(StandardSourceBuildCommand) $(StandardSourceBuildArgs) - $(ProjectDirectory)global.json - $(ProjectDirectory)NuGet.config true - false true - - - - diff --git a/src/SourceBuild/content/repo-projects/symreader.proj b/src/SourceBuild/content/repo-projects/symreader.proj index 57ab7cd52..6f905da54 100644 --- a/src/SourceBuild/content/repo-projects/symreader.proj +++ b/src/SourceBuild/content/repo-projects/symreader.proj @@ -3,15 +3,7 @@ $(StandardSourceBuildCommand) $(StandardSourceBuildArgs) - - $(ProjectDirectory)global.json - $(ProjectDirectory)NuGet.config - false - - - - diff --git a/src/SourceBuild/content/repo-projects/templating.proj b/src/SourceBuild/content/repo-projects/templating.proj index ed0971d42..2f54e0da3 100644 --- a/src/SourceBuild/content/repo-projects/templating.proj +++ b/src/SourceBuild/content/repo-projects/templating.proj @@ -7,10 +7,6 @@ $(BuildCommandArgs) $(FlagParameterPrefix)v $(LogVerbosity) $(BuildCommandArgs) $(FlagParameterPrefix)warnAsError $(ArcadeFalseBoolBuildArg) $(StandardSourceBuildCommand) $(BuildCommandArgs) - - $(ProjectDirectory)global.json - $(ProjectDirectory)NuGet.config - false @@ -18,9 +14,5 @@ - - - - diff --git a/src/SourceBuild/content/repo-projects/test-templates.proj b/src/SourceBuild/content/repo-projects/test-templates.proj index cbe50b8c6..61b87a209 100644 --- a/src/SourceBuild/content/repo-projects/test-templates.proj +++ b/src/SourceBuild/content/repo-projects/test-templates.proj @@ -6,10 +6,7 @@ $(BuildCommandArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg) $(StandardSourceBuildCommand) $(BuildCommandArgs) - $(ProjectDirectory)global.json - $(ProjectDirectory)NuGet.config true - false @@ -17,9 +14,5 @@ - - - - diff --git a/src/SourceBuild/content/repo-projects/vstest.proj b/src/SourceBuild/content/repo-projects/vstest.proj index 67eac4ddd..c0ce08237 100644 --- a/src/SourceBuild/content/repo-projects/vstest.proj +++ b/src/SourceBuild/content/repo-projects/vstest.proj @@ -6,9 +6,7 @@ $(BuildCommandArgs) /p:SemanticVersioningV1=true $(ProjectDirectory)\eng\common\build$(ShellExtension) $(BuildCommandArgs) - false true - $(ProjectDirectory)global.json diff --git a/src/SourceBuild/content/repo-projects/xdt.proj b/src/SourceBuild/content/repo-projects/xdt.proj index 31f889ad1..43d3336f2 100644 --- a/src/SourceBuild/content/repo-projects/xdt.proj +++ b/src/SourceBuild/content/repo-projects/xdt.proj @@ -6,19 +6,12 @@ $(BuildCommandArgs) $(FlagParameterPrefix)nodereuse $(ArcadeFalseBoolBuildArg) $(StandardSourceBuildCommand) $(BuildCommandArgs) - $(ProjectDirectory)global.json - $(ProjectDirectory)NuGet.config true - false - - - - diff --git a/src/SourceBuild/content/repo-projects/xliff-tasks.proj b/src/SourceBuild/content/repo-projects/xliff-tasks.proj index a5881adb4..e6c43dd75 100644 --- a/src/SourceBuild/content/repo-projects/xliff-tasks.proj +++ b/src/SourceBuild/content/repo-projects/xliff-tasks.proj @@ -5,18 +5,10 @@ $(StandardSourceBuildArgs) $(StandardSourceBuildCommand) $(BuildCommandArgs) - false - true true true - - $(ProjectDirectory)NuGet.config - - - -