dotnet · twsouthwick · Nov 20, 2024 · Nov 20, 2024
diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml
@@ -89,7 +89,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: Unsigned
-          path: "bin/${{ env.Configuration }}/packages/shipping/*"
+          path: "artifacts/package/${{ env.Configuration }}/*"
 
   sign:
     name: "Sign Package"

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,6 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <IsShipped>false</IsShipped>
     <NoWarn>$(NoWarn);SA0001</NoWarn>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
   </PropertyGroup>
@@ -13,6 +12,10 @@
     <!-- We want to use experimental APIs internally -->
     <NoWarn>$(NoWarn);OOXML0001;OOXML0002;OOXML0003;OOXML0004</NoWarn>
   </PropertyGroup>
+
+  <PropertyGroup>
+    <ArtifactsPath>$(MSBuildThisFileDirectory)artifacts</ArtifactsPath>
+  </PropertyGroup>
 
   <PropertyGroup>
     <IncludeSourceGenerator>false</IncludeSourceGenerator>
@@ -90,13 +93,6 @@
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)DocumentFormat.OpenXml.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <OutputFullPath>$(MSBuildThisFileDirectory)</OutputFullPath>
-    <OutputDrop Condition=" '$(OutputDrop)' == '' ">$(OutputFullPath)bin\$(Configuration)\</OutputDrop>
-    <OutputPath>$(OutputDrop)\$(MSBuildProjectName)\</OutputPath>
-    <BaseIntermediateOutputPath>$(OutputFullPath)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
-  </PropertyGroup>
-
   <PropertyGroup>
     <IsTestProject Condition=" '$(IsTestProject)' == '' ">false</IsTestProject>
     <IsBenchmarkProject Condition=" '$(IsBenchmarkProject)' == '' ">false</IsBenchmarkProject>

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -26,8 +26,5 @@
   </PropertyGroup>
   <Import Condition="$(IncludeFrameworkShims)" Project="$(MSBuildThisFileDirectory)src\common\FrameworkShims.targets" />
   <Import Condition="$(IncludeSourceGenerator)" Project="$(MSBuildThisFileDirectory)gen\DocumentFormat.OpenXml.Generator\SourceGenerator.targets" />
-  <PropertyGroup>
-    <PackageOutputPath>$(MSBuildThisFileDirectory)bin\$(Configuration)\packages\</PackageOutputPath>
-    <PackageOutputPath Condition="$(IsShipped)">$(PackageOutputPath)shipping\</PackageOutputPath>
-  </PropertyGroup>
+
 </Project>
diff --git a/gen/Directory.Build.props b/gen/Directory.Build.props
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+	<Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.props" />
+
+	<PropertyGroup>
+		<IsPackable>false</IsPackable>
+	</PropertyGroup>
+
+</Project>
diff --git a/gen/Directory.Build.targets b/gen/Directory.Build.targets
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.targets" />
+</Project>
diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-  <Import Project="..\Directory.Build.props" />
+	<Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.props" />
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
 		<TargetFrameworks>$(SamplesFrameworks)</TargetFrameworks>
-    <IsPackable>false</IsPackable>
+		<IsPackable>false</IsPackable>
 	</PropertyGroup>
 
 </Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-  <Import Project="..\Directory.Build.props" />
+	<Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.props" />
 
   <PropertyGroup>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>

diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -1,8 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Project>
 
   <PropertyGroup>
     <EnablePackageValidation>true</EnablePackageValidation>
-    <PackageValidationBaselineVersion>3.0.0</PackageValidationBaselineVersion>
+    <PackageValidationBaselineVersion>3.1.1</PackageValidationBaselineVersion>
   </PropertyGroup>
 
   <ItemGroup Condition="$(IsFramework)">
@@ -12,5 +13,5 @@
 
   <Import Project="$(MSBuildThisFileDirectory)\PEVerify.targets" />
 
-  <Import Project="..\Directory.Build.targets" />
+	<Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.targets" />
 </Project>
diff --git a/src/DocumentFormat.OpenXml.Features/DocumentFormat.OpenXml.Features.csproj b/src/DocumentFormat.OpenXml.Features/DocumentFormat.OpenXml.Features.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <IsShipped>true</IsShipped>
     <IncludeFrameworkShims>true</IncludeFrameworkShims>
     <TargetFrameworks>$(ProductTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>

diff --git a/src/DocumentFormat.OpenXml.Framework/DocumentFormat.OpenXml.Framework.csproj b/src/DocumentFormat.OpenXml.Framework/DocumentFormat.OpenXml.Framework.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <IsShipped>true</IsShipped>
     <NoWarn>$(NoWarn);3003</NoWarn>
     <IncludeFrameworkShims>true</IncludeFrameworkShims>
     <IsNew>true</IsNew>    

diff --git a/src/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Linq.csproj b/src/DocumentFormat.OpenXml.Linq/DocumentFormat.OpenXml.Linq.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <IsShipped>true</IsShipped>    
     <TargetFrameworks>$(ProductTargetFrameworks)</TargetFrameworks>
     <Summary>Provides additional LINQ functionality to the Open XML SDK.</Summary>
     <Description>Provides additional LINQ functionality to the Open XML SDK to allow operations using XLINQ.</Description>

diff --git a/src/DocumentFormat.OpenXml/DocumentFormat.OpenXml.csproj b/src/DocumentFormat.OpenXml/DocumentFormat.OpenXml.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <IsShipped>true</IsShipped>
     <NoWarn>$(NoWarn);3003;CS0436</NoWarn>
 
     <!-- For now, we have internal access to the framework assembly. That should be removed, and then we'll need to turn this on. -->

diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-  <Import Project="..\Directory.Build.props" />
-</Project>
+	<Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.props" />
+
+	<PropertyGroup>
+		<IsPackable>false</IsPackable>
+	</PropertyGroup>
+</Project>
diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Project>
   <Choose>
     <When Condition="$(IsTestProject)">
@@ -36,5 +37,6 @@
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="Publish" Properties="TargetFramework=%(_PublishFramework.Identity)" />
   </Target>
   <Target Name="PublishAll" Condition="$(IsTestProject) OR $(IsBenchmarkProject)" DependsOnTargets="PublishProjectIfFrameworkSet;PublishProjectForAllFrameworksIfFrameworkUnset" />
-  <Import Project="..\Directory.Build.targets" />
+
+	<Import Project="$(MSBuildThisFileDirectory)..\Directory.Build.targets" />
 </Project>
diff --git a/test/DocumentFormat.OpenXml.Benchmarks/DocumentFormat.OpenXml.Benchmarks.csproj b/test/DocumentFormat.OpenXml.Benchmarks/DocumentFormat.OpenXml.Benchmarks.csproj
@@ -5,7 +5,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <NoWarn>$(NoWarn);CA1822</NoWarn>
-    <IsPackable>false</IsPackable>
     <IsBenchmarkProject>true</IsBenchmarkProject>
     <!-- These tests don't use the xunit runner, but as an exe -->
     <IsTestProject>false</IsTestProject>

diff --git a/...t.OpenXml.Framework.Features.Tests/DocumentFormat.OpenXml.Framework.Features.Tests.csproj b/...t.OpenXml.Framework.Features.Tests/DocumentFormat.OpenXml.Framework.Features.Tests.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFrameworks>$(TestTargetFrameworks)</TargetFrameworks>
     <IsTestProject>true</IsTestProject>
-    <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
     <IncludeFrameworkShims>true</IncludeFrameworkShims>
   </PropertyGroup>

diff --git a/test/DocumentFormat.OpenXml.Linq.Tests/DocumentFormat.OpenXml.Linq.Tests.csproj b/test/DocumentFormat.OpenXml.Linq.Tests/DocumentFormat.OpenXml.Linq.Tests.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFrameworks>$(TestTargetFrameworks)</TargetFrameworks>
     <IsTestProject>true</IsTestProject>
-    <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

diff --git a/test/DocumentFormat.OpenXml.Packaging.Tests/DocumentFormat.OpenXml.Packaging.Tests.csproj b/test/DocumentFormat.OpenXml.Packaging.Tests/DocumentFormat.OpenXml.Packaging.Tests.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <TargetFrameworks>$(TestTargetFrameworks)</TargetFrameworks>
     <IsTestProject>true</IsTestProject>
-    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/test/DocumentFormat.OpenXml.Tests.Assets/DocumentFormat.OpenXml.Tests.Assets.csproj b/test/DocumentFormat.OpenXml.Tests.Assets/DocumentFormat.OpenXml.Tests.Assets.csproj
@@ -3,7 +3,6 @@
     <TargetFrameworks>$(AssetsTargetFrameworks)</TargetFrameworks>
     <NoWarn>$(NoWarn);CA1822;CA1034</NoWarn>
     <IsTestProject>false</IsTestProject>
-    <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
     <EmbeddedResource Include="assets\**\*" />