diff --git a/src/SourceBuild/tarball/content/repos/Directory.Build.props b/src/SourceBuild/tarball/content/repos/Directory.Build.props
index 64ff671af..72a24cd7e 100644
--- a/src/SourceBuild/tarball/content/repos/Directory.Build.props
+++ b/src/SourceBuild/tarball/content/repos/Directory.Build.props
@@ -18,6 +18,8 @@
>> $(RepoConsoleLogFile) 2>&1
true
+ $(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/
+
diff --git a/src/SourceBuild/tarball/content/repos/arcade.proj b/src/SourceBuild/tarball/content/repos/arcade.proj
index 6ef6bbc5b..f9f50ac9a 100644
--- a/src/SourceBuild/tarball/content/repos/arcade.proj
+++ b/src/SourceBuild/tarball/content/repos/arcade.proj
@@ -6,15 +6,13 @@
$(StandardSourceBuildCommand) $(StandardSourceBuildArgs)
- $(ProjectDirectory)/NuGet.config
+ $(ProjectDirectory)NuGet.config
$(ProjectDirectory)global.json
true
false
- $(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/
-
true
true
diff --git a/src/SourceBuild/tarball/content/repos/clicommandlineparser.proj b/src/SourceBuild/tarball/content/repos/clicommandlineparser.proj
index 19a01f0a9..abd476804 100644
--- a/src/SourceBuild/tarball/content/repos/clicommandlineparser.proj
+++ b/src/SourceBuild/tarball/content/repos/clicommandlineparser.proj
@@ -24,9 +24,8 @@
false
$(ProjectDirectory)global.json
- $(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/
false
- $(ProjectDirectory)/NuGet.config
+ $(ProjectDirectory)NuGet.config
diff --git a/src/SourceBuild/tarball/content/repos/command-line-api.proj b/src/SourceBuild/tarball/content/repos/command-line-api.proj
index 6500c36f4..b175fec4c 100644
--- a/src/SourceBuild/tarball/content/repos/command-line-api.proj
+++ b/src/SourceBuild/tarball/content/repos/command-line-api.proj
@@ -9,7 +9,6 @@
$(ProjectDirectory)global.json
$(ProjectDirectory)NuGet.config
true
- $(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/
diff --git a/src/SourceBuild/tarball/content/repos/common.proj b/src/SourceBuild/tarball/content/repos/common.proj
deleted file mode 100644
index 2c04a0bfa..000000000
--- a/src/SourceBuild/tarball/content/repos/common.proj
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
- aspnet
- servicing/1.0.x
- $(ProjectDirectory)artifacts/build/
- /p:Configuration=$(Configuration)
- $(ProjectDirectory)/build$(ShellExtension) -NoTest $(BuildArguments)
- $(ProjectDirectory)/clean$(ShellExtension) $(BuildArguments)
- false
- true
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/SourceBuild/tarball/content/repos/diagnostics.proj b/src/SourceBuild/tarball/content/repos/diagnostics.proj
index 169fe0965..810215468 100644
--- a/src/SourceBuild/tarball/content/repos/diagnostics.proj
+++ b/src/SourceBuild/tarball/content/repos/diagnostics.proj
@@ -5,7 +5,6 @@
$(ProjectDirectory)global.json
$(ProjectDirectory)NuGet.config
- $(ProjectDirectory)/artifacts/packages/$(Configuration)/Shipping
false
true
diff --git a/src/SourceBuild/tarball/content/repos/fsharp.proj b/src/SourceBuild/tarball/content/repos/fsharp.proj
index 22dd1b7e7..ab312770e 100644
--- a/src/SourceBuild/tarball/content/repos/fsharp.proj
+++ b/src/SourceBuild/tarball/content/repos/fsharp.proj
@@ -11,10 +11,9 @@
$(BuildCommandArgs) /p:TreatWarningsAsErrors=false
$(ProjectDirectory)build$(ShellExtension) $(BuildCommandArgs)
- $(ProjectDirectory)artifacts/packages/$(Configuration)/Shipping/
false
$(ProjectDirectory)global.json
- $(ProjectDirectory)/NuGet.config
+ $(ProjectDirectory)NuGet.config
true
diff --git a/src/SourceBuild/tarball/content/repos/installer.proj b/src/SourceBuild/tarball/content/repos/installer.proj
index fd8a95be0..d2a06b2a9 100644
--- a/src/SourceBuild/tarball/content/repos/installer.proj
+++ b/src/SourceBuild/tarball/content/repos/installer.proj
@@ -51,7 +51,6 @@
osx-x64
freebsd-x64
$(TargetRid)
- $(ProjectDirectory)artifacts/packages/$(Configuration)/Shipping/
$(PackagesOutput)
false
true
@@ -62,7 +61,7 @@
true
- $(ProjectDirectory)/NuGet.config
+ $(ProjectDirectory)NuGet.config
true
diff --git a/src/SourceBuild/tarball/content/repos/linker.proj b/src/SourceBuild/tarball/content/repos/linker.proj
index e729ff22a..d006497db 100644
--- a/src/SourceBuild/tarball/content/repos/linker.proj
+++ b/src/SourceBuild/tarball/content/repos/linker.proj
@@ -7,10 +7,8 @@
$(StandardSourceBuildCommand) $(StandardSourceBuildArgs)
- $(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/
-
false
- $(ProjectDirectory)/NuGet.config
+ $(ProjectDirectory)NuGet.config
true
diff --git a/src/SourceBuild/tarball/content/repos/msbuild.proj b/src/SourceBuild/tarball/content/repos/msbuild.proj
index d635daa70..b0d6f22da 100644
--- a/src/SourceBuild/tarball/content/repos/msbuild.proj
+++ b/src/SourceBuild/tarball/content/repos/msbuild.proj
@@ -27,7 +27,7 @@
$(ProjectDirectory)build$(ShellExtension) $(BuildCommandArgs)
- $(ProjectDirectory)/NuGet.config
+ $(ProjectDirectory)NuGet.config
true
false
diff --git a/src/SourceBuild/tarball/content/repos/nuget-client.proj b/src/SourceBuild/tarball/content/repos/nuget-client.proj
index 326263038..2186ca8e5 100644
--- a/src/SourceBuild/tarball/content/repos/nuget-client.proj
+++ b/src/SourceBuild/tarball/content/repos/nuget-client.proj
@@ -7,7 +7,6 @@
- $(ProjectDirectory)artifacts/nupkgs/
$(ProjectDirectory)src/NuGet.Core/
$(ProjectDirectory)cli/
$(KeysDir)NuGet.Client.snk
diff --git a/src/SourceBuild/tarball/content/repos/roslyn-analyzers.proj b/src/SourceBuild/tarball/content/repos/roslyn-analyzers.proj
index 3d517f6ef..2880c054d 100644
--- a/src/SourceBuild/tarball/content/repos/roslyn-analyzers.proj
+++ b/src/SourceBuild/tarball/content/repos/roslyn-analyzers.proj
@@ -18,7 +18,6 @@
$(ProjectDirectory)build$(ShellExtension) $(BuildCommandArgs)
- $(ProjectDirectory)artifacts/packages/$(Configuration)/Shipping/
false
true
true
diff --git a/src/SourceBuild/tarball/content/repos/roslyn.proj b/src/SourceBuild/tarball/content/repos/roslyn.proj
index 4b992ed3c..c007a7e8b 100644
--- a/src/SourceBuild/tarball/content/repos/roslyn.proj
+++ b/src/SourceBuild/tarball/content/repos/roslyn.proj
@@ -23,7 +23,6 @@
$(ProjectDirectory)build$(ShellExtension) $(BuildCommandArgs)
- $(ProjectDirectory)artifacts/packages/$(Configuration)/Shipping/
false
true
$(ProjectDirectory)global.json
diff --git a/src/SourceBuild/tarball/content/repos/runtime.common.props b/src/SourceBuild/tarball/content/repos/runtime.common.props
index 16e04fcd5..994e7bf22 100644
--- a/src/SourceBuild/tarball/content/repos/runtime.common.props
+++ b/src/SourceBuild/tarball/content/repos/runtime.common.props
@@ -109,10 +109,9 @@
false
- $(ProjectDirectory)bin/Product/$(TargetOS).$(Platform).$(Configuration)/.nuget/pkg
$(ProjectDirectory)artifacts/packages/$(Configuration)/Shipping/
$(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/
- $(ProjectDirectory)/NuGet.config
+ $(ProjectDirectory)NuGet.config
true
diff --git a/src/SourceBuild/tarball/content/repos/sdk.proj b/src/SourceBuild/tarball/content/repos/sdk.proj
index e07149dab..2f8a83910 100644
--- a/src/SourceBuild/tarball/content/repos/sdk.proj
+++ b/src/SourceBuild/tarball/content/repos/sdk.proj
@@ -29,12 +29,11 @@
$(ProjectDirectory)\build$(ShellExtension) $(BuildCommandArgs)
- $(ProjectDirectory)/NuGet.config
+ $(ProjectDirectory)NuGet.config
$(ProjectDirectory)global.json
true
false
- $(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/
$(SourceBuiltPackagesPath)
$(EnvironmentRestoreSources)%3B$(ReferencePackagesDir)%3B$(PrebuiltPackagesPath)
diff --git a/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj b/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj
index 0e2fd6dc7..85a3365e8 100644
--- a/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj
+++ b/src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj
@@ -6,7 +6,6 @@
$(StandardSourceBuildCommand) $(StandardSourceBuildArgs)
false
- $(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/
true
diff --git a/src/SourceBuild/tarball/content/repos/source-build.proj b/src/SourceBuild/tarball/content/repos/source-build.proj
index 6467939ce..c82af24d5 100644
--- a/src/SourceBuild/tarball/content/repos/source-build.proj
+++ b/src/SourceBuild/tarball/content/repos/source-build.proj
@@ -5,7 +5,6 @@
$(StandardSourceBuildCommand) $(StandardSourceBuildArgs)
$(ProjectDirectory)NuGet.config
- $(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/
diff --git a/src/SourceBuild/tarball/content/repos/sourcelink.proj b/src/SourceBuild/tarball/content/repos/sourcelink.proj
index d3123fa2b..c79b77ea0 100644
--- a/src/SourceBuild/tarball/content/repos/sourcelink.proj
+++ b/src/SourceBuild/tarball/content/repos/sourcelink.proj
@@ -9,7 +9,6 @@
$(ProjectDirectory)NuGet.config
true
false
- $(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/
true
diff --git a/src/SourceBuild/tarball/content/repos/symreader.proj b/src/SourceBuild/tarball/content/repos/symreader.proj
index 0e8284c7e..bcecc7120 100644
--- a/src/SourceBuild/tarball/content/repos/symreader.proj
+++ b/src/SourceBuild/tarball/content/repos/symreader.proj
@@ -5,7 +5,6 @@
$(ProjectDirectory)global.json
$(ProjectDirectory)nuget.config
- $(ProjectDirectory)/artifacts/packages/$(Configuration)/Shipping
false
true
diff --git a/src/SourceBuild/tarball/content/repos/test-templates.proj b/src/SourceBuild/tarball/content/repos/test-templates.proj
index 2951834f1..547dfc2c3 100644
--- a/src/SourceBuild/tarball/content/repos/test-templates.proj
+++ b/src/SourceBuild/tarball/content/repos/test-templates.proj
@@ -14,7 +14,6 @@
$(ProjectDirectory)NuGet.config
true
false
- $(ProjectDirectory)artifacts/packages/$(Configuration)/Shipping/
diff --git a/src/SourceBuild/tarball/content/repos/vstest.proj b/src/SourceBuild/tarball/content/repos/vstest.proj
index e1feeb741..d111a824d 100644
--- a/src/SourceBuild/tarball/content/repos/vstest.proj
+++ b/src/SourceBuild/tarball/content/repos/vstest.proj
@@ -14,7 +14,6 @@
$(ProjectDirectory)/build$(ShellExtension) $(BuildCommandArgs)
- $(ProjectDirectory)/artifacts/$(Configuration)/packages
false
true
$(ProjectDirectory)global.json
diff --git a/src/SourceBuild/tarball/content/repos/xdt.proj b/src/SourceBuild/tarball/content/repos/xdt.proj
index 570f1560c..d5acc1135 100644
--- a/src/SourceBuild/tarball/content/repos/xdt.proj
+++ b/src/SourceBuild/tarball/content/repos/xdt.proj
@@ -8,7 +8,6 @@
$(ProjectDirectory)global.json
$(ProjectDirectory)NuGet.config
true
- $(ProjectDirectory)artifacts/packages/$(Configuration)/NonShipping/
diff --git a/src/SourceBuild/tarball/content/repos/xliff-tasks.proj b/src/SourceBuild/tarball/content/repos/xliff-tasks.proj
index 849340be0..dff8b1b16 100644
--- a/src/SourceBuild/tarball/content/repos/xliff-tasks.proj
+++ b/src/SourceBuild/tarball/content/repos/xliff-tasks.proj
@@ -12,13 +12,12 @@
$(DotnetToolCommand) $(BuildCommandArgs)
- $(ProjectDirectory)artifacts/packages/$(Configuration)/Shipping/
false
true
true
true
- $(ProjectDirectory)/NuGet.config
+ $(ProjectDirectory)NuGet.config
$(SourceBuiltPackagesPath)
$(EnvironmentRestoreSources)%3B$(ReferencePackagesDir)%3B$(PrebuiltPackagesPath)
$(EnvironmentRestoreSources)%3Bhttps://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public%40Local/nuget/v3/index.json