Resolve issue with ArtifactsPath

CZEMacLeod · Aug 11, 2024 · e1c1256 · e1c1256
1 parent a269567
commit e1c1256
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 14 deletions.
diff --git a/Directory.Build.Props b/Directory.Build.Props
@@ -6,5 +6,7 @@
     <PackageOutputPath Condition="'$(PackageOutputPath)'==''">$(MSBuildThisFileDirectory)packages\</PackageOutputPath>
     <EnableDefaultNoneItems>false</EnableDefaultNoneItems>
     <NoWarn>$(NoWarn);NU5128;SA0001</NoWarn>
+
+    <ArtifactsPath>$(BaseArtifactsPath)$(MSBuildProjectName)\</ArtifactsPath>
   </PropertyGroup>
 </Project>
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -77,18 +77,6 @@ steps:
   fetchDepth: 0
   fetchTags: true
 
-- powershell: 'Write-Host ("##vso[task.setvariable variable=project_to_build;]$($ENV:project_to_build);MSBuild.SDK.SystemWeb")'
-  displayName: 'Force building MSBuild.SDK.SystemWeb'
-  condition: eq(variables['build_sdk'],true)
-
-- powershell: 'Write-Host ("##vso[task.setvariable variable=project_to_build;]$($env:project_to_build);MSBuild.SDK.SystemWeb.RazorLibrary")'
-  displayName: 'Force building MSBuild.SDK.SystemWeb.RazorLibrary'
-  condition: eq(variables['build_razor_sdk'],true)
-
-- powershell: 'Write-Host ("##vso[task.setvariable variable=project_to_build;]$($env:project_to_build);MSBuild.SDK.SystemWeb.Templates")'
-  displayName: 'Force building MSBuild.SDK.SystemWeb.Templates'
-  condition: eq(variables['build_templates'],true)
-
 - powershell: 'Write-Host ("##vso[task.setvariable variable=MSBuildEmitSolution;]0")'
   displayName: 'Ensure MSBuildEmitSolution is not set'
 

diff --git a/src/MSBuild.SDK.SystemWeb.RazorLibrary/MSBuild.SDK.SystemWeb.RazorLibrary.csproj b/src/MSBuild.SDK.SystemWeb.RazorLibrary/MSBuild.SDK.SystemWeb.RazorLibrary.csproj
@@ -3,7 +3,6 @@
     <TargetFramework>net472</TargetFramework>
     <Description>Provides targets for Razor Library projects that target System.Web.</Description>
     <PackageTags>MSBuild;MSBuildSdk;System.Web;Razor;MVC5</PackageTags>
-    <ArtifactsPath>$(BaseArtifactsPath)$(MSBuildProjectName)\</ArtifactsPath>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageType>MSBuildSdk</PackageType>
     <PackageReadmeFile>README.md</PackageReadmeFile>

diff --git a/src/MSBuild.SDK.SystemWeb/MSBuild.SDK.SystemWeb.csproj b/src/MSBuild.SDK.SystemWeb/MSBuild.SDK.SystemWeb.csproj
@@ -3,7 +3,6 @@
     <TargetFramework>net472</TargetFramework>
     <Description>Provides targets for projects that target System.Web.</Description>
     <PackageTags>MSBuild;MSBuildSdk;System.Web</PackageTags>
-    <ArtifactsPath>$(BaseArtifactsPath)$(MSBuildProjectName)\</ArtifactsPath>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageType>MSBuildSdk</PackageType>
     <PackageReadmeFile>README.md</PackageReadmeFile>