Merge pull request #15 from dotnet-campus/t/walterlv/buildTransitive

使源生成器的参数可在传递项目中生效
dotnet-campus · Aug 14, 2024 · dce0c0d · dce0c0d
2 parents 87cb9d1 + c43be67
commit dce0c0d
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 21 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -21,4 +21,6 @@
     <PackageProjectUrl>https://github.com/dotnet-campus/dotnetCampus.Logger</PackageProjectUrl>
   </PropertyGroup>
 
+  <Import Project="$(MSBuildThisFileDirectory)src\dotnetCampus.Logger\Properties\Package\buildTransitive\Package.props" />
+
 </Project>
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -0,0 +1,5 @@
+<Project>
+
+  <Import Project="$(MSBuildThisFileDirectory)src\dotnetCampus.Logger\Properties\Package\buildTransitive\Package.targets" />
+
+</Project>
diff --git a/build/Version.props b/build/Version.props
@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <Version>0.1.0-alpha01</Version>
+    <Version>9999.0.0-localbuild</Version>
   </PropertyGroup>
 </Project>
diff --git a/dotnetCampus.Logger.sln b/dotnetCampus.Logger.sln
@@ -15,6 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{AFB0DF31
 		build\Version.props = build\Version.props
 		.gitattributes = .gitattributes
 		.gitignore = .gitignore
+		Directory.Build.targets = Directory.Build.targets
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoggerSample.MainApp", "samples\LoggerSample.MainApp\LoggerSample.MainApp.csproj", "{C282F00B-0C42-491F-AC0D-967407E1C418}"

diff --git a/samples/LoggerSample.LoggerDependentLibrary/LoggerSample.LoggerDependentLibrary.csproj b/samples/LoggerSample.LoggerDependentLibrary/LoggerSample.LoggerDependentLibrary.csproj
@@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\src\dotnetCampus.Logger\Properties\Package\build\Package.props" />
-
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -11,6 +9,4 @@
     <ProjectReference Include="..\..\src\dotnetCampus.Logger\dotnetCampus.Logger.csproj" />
   </ItemGroup>
 
-  <Import Project="..\..\src\dotnetCampus.Logger\Properties\Package\build\Package.targets" />
-
 </Project>
diff --git a/samples/LoggerSample.LoggerIndependentLibrary/LoggerSample.LoggerIndependentLibrary.csproj b/samples/LoggerSample.LoggerIndependentLibrary/LoggerSample.LoggerIndependentLibrary.csproj
@@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\src\dotnetCampus.Logger\Properties\Package\build\Package.props" />
-
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -12,6 +10,4 @@
     <ProjectReference Include="..\..\src\dotnetCampus.Logger.Analyzer\dotnetCampus.Logger.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
-  <Import Project="..\..\src\dotnetCampus.Logger\Properties\Package\build\Package.targets" />
-
 </Project>
diff --git a/samples/LoggerSample.LoggerIndependentProject/LoggerSample.LoggerIndependentProject.csproj b/samples/LoggerSample.LoggerIndependentProject/LoggerSample.LoggerIndependentProject.csproj
@@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\src\dotnetCampus.Logger\Properties\Package\build\Package.props" />
-
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
@@ -12,6 +10,4 @@
     <ProjectReference Include="..\..\src\dotnetCampus.Logger.Analyzer\dotnetCampus.Logger.Analyzer.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
-  <Import Project="..\..\src\dotnetCampus.Logger\Properties\Package\build\Package.targets" />
-
 </Project>
diff --git a/samples/LoggerSample.MainApp/LoggerSample.MainApp.csproj b/samples/LoggerSample.MainApp/LoggerSample.MainApp.csproj
@@ -1,7 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\..\src\dotnetCampus.Logger\Properties\Package\build\Package.props" />
-
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
@@ -16,6 +14,4 @@
     <ProjectReference Include="..\LoggerSample.LoggerIndependentProject\LoggerSample.LoggerIndependentProject.csproj" />
   </ItemGroup>
 
-  <Import Project="..\..\src\dotnetCampus.Logger\Properties\Package\build\Package.targets" />
-
 </Project>
diff --git a/...er/Properties/Package/build/Package.props → ...ies/Package/buildTransitive/Package.props b/...er/Properties/Package/build/Package.props → ...ies/Package/buildTransitive/Package.props
diff --git a/.../Properties/Package/build/Package.targets → ...s/Package/buildTransitive/Package.targets b/.../Properties/Package/build/Package.targets → ...s/Package/buildTransitive/Package.targets
diff --git a/src/dotnetCampus.Logger/dotnetCampus.Logger.csproj b/src/dotnetCampus.Logger/dotnetCampus.Logger.csproj
@@ -14,9 +14,12 @@
   <!-- Project Information -->
   <PropertyGroup>
     <RootNamespace>dotnetCampus.Logging</RootNamespace>
-    <Deterministic>true</Deterministic>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <IncludeSymbols>true</IncludeSymbols>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -44,8 +47,8 @@
   <!-- 生成 NuGet 包。 -->
   <Target Name="_IncludeAllDependencies" BeforeTargets="_GetPackageFiles">
     <ItemGroup>
-      <None Include="Properties\Package\build\Package.props" Pack="True" PackagePath="build\$(PackageId).props" />
-      <None Include="Properties\Package\build\Package.targets" Pack="True" PackagePath="build\$(PackageId).targets" />
+      <None Include="Properties\Package\buildTransitive\Package.props" Pack="True" PackagePath="buildTransitive\$(PackageId).props" />
+      <None Include="Properties\Package\buildTransitive\Package.targets" Pack="True" PackagePath="buildTransitive\$(PackageId).targets" />
       <None Include="..\..\artifacts\bin\dotnetCampus.Logger.Analyzer\$(Configuration)\**\*.dll" Pack="True" PackagePath="analyzers\dotnet\cs" />
     </ItemGroup>
   </Target>