diff --git a/Directory.Build.props b/Directory.Build.props
index ef670c06ea..055573fd02 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -111,6 +111,7 @@
$(MSBuildThisFileDirectory)artifacts\
$(ArtifactsDir)obj\
+ $(ArtifactsDir)bin\
$(ArtifactsDir)$(Configuration)\
$(ArtifactsDir)packages\$(Configuration)\
$(ArtifactsPackagesDir)Shipping\
@@ -128,11 +129,13 @@
- $(RepositoryRoot)bin\$(MSBuildProjectName)\
+ $(MSBuildProjectName)
+
+ $([System.IO.Path]::GetFullPath('$(ArtifactsBinDir)$(OutDirName)\'))
$(BaseOutputPath)$(Configuration)\
$(BaseOutputPath)$(PlatformName)\$(Configuration)\
- $(RepositoryRoot)obj\$(MSBuildProjectName)\
+ $([System.IO.Path]::GetFullPath('$(ArtifactsObjDir)$(OutDirName)\'))
$(BaseIntermediateOutputPath)$(Configuration)\
$(BaseIntermediateOutputPath)$(PlatformName)\$(Configuration)\
diff --git a/build/CodeSign.targets b/build/CodeSign.targets
index 6827c8c2a4..e3b5a47269 100644
--- a/build/CodeSign.targets
+++ b/build/CodeSign.targets
@@ -4,9 +4,18 @@
$(CodeSignDependsOn);CollectFileSignInfo
+
+
+
+
+
+
+
+
+
- $(IntermediateDir)ar\
+ $(ArtifactsDir)obj\ar\
$(BaseRedistNetCorePath)$(TargetRuntimeIdentifier)\
diff --git a/build/repo.props b/build/repo.props
index 5ffd98230b..6fe7f20689 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -14,8 +14,9 @@
false
- $(ArtifactsDir)packages\$(Configuration)\Shipping\
- $(ArtifactsDir)packages\$(Configuration)\NonShipping\
+ $(ArtifactsDir)packages\$(Configuration)\
+ $(ArtifactsPackagesDir)Shipping\
+ $(ArtifactsPackagesDir)NonShipping\
$(ArtifactsDir)installers\$(Configuration)\
$(ArtifactsDir)VSSetup\$(Configuration)\
diff --git a/eng/tools/XplatPackageSigner/XplatPackageSigner.proj b/eng/tools/XplatPackageSigner/XplatPackageSigner.proj
index bde2dc9a28..493b463c48 100644
--- a/eng/tools/XplatPackageSigner/XplatPackageSigner.proj
+++ b/eng/tools/XplatPackageSigner/XplatPackageSigner.proj
@@ -16,7 +16,7 @@
$([MSBuild]::NormalizeDirectory($(DirectoryToSign)))
- $(RepositoryRoot)obj\$(MSBuildProjectName)\
+ $(BaseIntermediateOutputPath)
diff --git a/src/Framework/pkg/Microsoft.AspNetCore.App.pkgproj b/src/Framework/pkg/Microsoft.AspNetCore.App.pkgproj
index 4325322c0a..13cf74ed9e 100644
--- a/src/Framework/pkg/Microsoft.AspNetCore.App.pkgproj
+++ b/src/Framework/pkg/Microsoft.AspNetCore.App.pkgproj
@@ -1,6 +1,7 @@
- $(RepositoryRoot)obj\pkg\$(MSBuildProjectName)\
+ true
+ $(MSBuildProjectName).Pkg
false
diff --git a/src/Framework/src/Microsoft.AspNetCore.App.shfxproj b/src/Framework/src/Microsoft.AspNetCore.App.shfxproj
index 170ced504d..eb5013b9de 100644
--- a/src/Framework/src/Microsoft.AspNetCore.App.shfxproj
+++ b/src/Framework/src/Microsoft.AspNetCore.App.shfxproj
@@ -1,7 +1,8 @@
- $(RepositoryRoot)bin\fx\$(TargetOsName)\$(TargetArchitecture)\$(MSBuildProjectName)\
- $(RepositoryRoot)obj\fx\$(MSBuildProjectName)\
+ true
+ $(TargetOsName)-$(TargetArchitecture)
+ fx
diff --git a/src/Installers/Archive/Archive.Internal.zipproj b/src/Installers/Archive/Archive.Internal.zipproj
index def274cd5e..35cee32ac9 100644
--- a/src/Installers/Archive/Archive.Internal.zipproj
+++ b/src/Installers/Archive/Archive.Internal.zipproj
@@ -9,7 +9,7 @@
- $(RepositoryRoot)obj\ai\$(TargetRuntimeIdentifier)\
+ $(ArtifactsObjDir)ai\$(TargetRuntimeIdentifier)\
$(InternalInstallerBaseName)-$(PackageVersion)-$(TargetRuntimeIdentifier)$(ArchiveExtension)
$(InstallersOutputPath)
$(InstallersOutputPath)$(OutputFileName)
diff --git a/src/Installers/Archive/Archive.Redist.zipproj b/src/Installers/Archive/Archive.Redist.zipproj
index d4a3520504..abb30f65f5 100644
--- a/src/Installers/Archive/Archive.Redist.zipproj
+++ b/src/Installers/Archive/Archive.Redist.zipproj
@@ -8,7 +8,7 @@
- $(RepositoryRoot)obj\ar\
+ $(ArtifactsObjDir)ar\
$(BaseIntermediateOutputPath)$(TargetRuntimeIdentifier)\
$(RuntimeInstallerBaseName)-$(PackageVersion)-$(TargetRuntimeIdentifier)$(ArchiveExtension)
$(InstallersOutputPath)
diff --git a/src/Installers/Debian/Runtime.debproj b/src/Installers/Debian/Runtime.debproj
index c1b4cbf907..7876521cfa 100644
--- a/src/Installers/Debian/Runtime.debproj
+++ b/src/Installers/Debian/Runtime.debproj
@@ -9,7 +9,7 @@
- $(RepositoryRoot)obj\Debian\$(MSBuildProjectName)\
+ $(ArtifactsObjDir)Debian\$(MSBuildProjectName)\
$(BaseIntermediateOutputPath)$(TargetRuntimeIdentifier)\
$(IntermediateOutputPath)package_root\
diff --git a/src/Installers/Rpm/Rpm.props b/src/Installers/Rpm/Rpm.props
index 607f5ae374..ac6e457421 100644
--- a/src/Installers/Rpm/Rpm.props
+++ b/src/Installers/Rpm/Rpm.props
@@ -7,7 +7,7 @@
- $(RepositoryRoot)obj\Rpm\$(MSBuildProjectName)\
+ $(ArtifactsObjDir)Rpm\$(MSBuildProjectName)\
$(BaseIntermediateOutputPath)$(TargetRuntimeIdentifier)\
$([MSBuild]::NormalizeDirectory('$(IntermediateOutputPath)content/'))
$(InstallersOutputPath)
diff --git a/src/ProjectTemplates/test/SpaTemplateTest/ReactTemplateTest.cs b/src/ProjectTemplates/test/SpaTemplateTest/ReactTemplateTest.cs
index ef73344f05..25afb0b24e 100644
--- a/src/ProjectTemplates/test/SpaTemplateTest/ReactTemplateTest.cs
+++ b/src/ProjectTemplates/test/SpaTemplateTest/ReactTemplateTest.cs
@@ -14,7 +14,7 @@ namespace Templates.Test.SpaTemplateTest
{
}
- [Fact]
+ [Fact(Skip = "This test is broken. Using https://github.com/aspnet/AspNetCore-Internal/issues/1745 to track re-enabling this.")]
public void ReactTemplate_Works_NetCore()
=> SpaTemplateImpl("react");
}
diff --git a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj
index 8f46f32204..0bd58e2bad 100644
--- a/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj
+++ b/src/SiteExtensions/Runtime/Microsoft.AspNetCore.Runtime.SiteExtension.pkgproj
@@ -11,7 +11,7 @@
aspnetcore;AzureSiteExtension
AspNetCoreRuntime.$(TrimmedVersion).$(TargetArchitecture)
true
- $(RepositoryRoot)obj\ar\$(TargetRuntimeIdentifier)\
+ $(ArtifactsObjDir)ar\$(TargetRuntimeIdentifier)\
true
@@ -19,7 +19,7 @@
-
+