cleanup build

loresoft · Aug 10, 2023 · 60712d4 · 60712d4
1 parent 857a82e
commit 60712d4
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 33 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -33,34 +33,15 @@ jobs:
       with:
         dotnet-version: 7.0.x
 
-    - name: Calculate Version
-      run: |
-        dotnet tool update -g minver-cli
-        echo "BUILD_VERSION=$(minver -v e -t v)" >> $GITHUB_ENV
-
     - name: Restore Dependencies
       run: dotnet restore
 
     - name: Build Solution
-      run: 'dotnet build --no-restore --configuration Release -p:Version="${{env.BUILD_VERSION}}" -p:InformationalVersion="${{env.BUILD_VERSION}}+${{github.sha}}"'
+      run: 'dotnet build --no-restore --configuration Release'
 
     - name: Run Test
       run: dotnet test --no-build --configuration Release --collect:"XPlat Code Coverage" --settings coverlet.runsettings
 
-    - name: Generate Coverage 
-      uses: danielpalme/ReportGenerator-GitHub-Action@5.1.23
-      with:
-        reports: '${{github.workspace}}/test/*/TestResults/*/coverage.info'
-        targetdir: ${{env.BUILD_PATH}}
-        reporttypes: lcov
-
-    - name: Report Coverage
-      if: success()
-      uses: coverallsapp/github-action@v2
-      with:
-          file: artifacts/lcov.info
-          format: lcov
-
     - name: Create Packages
       if: success() && github.event_name != 'pull_request'
       run: dotnet pack --configuration Release --include-symbols --include-source --no-build --no-restore --output "${{env.BUILD_PATH}}"

diff --git a/AssemblyMetadata.Generators.sln b/AssemblyMetadata.Generators.sln
@@ -7,6 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyMetadata.Generators
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{1BA030F4-6549-4F95-ACEA-80E992C519BD}"
 	ProjectSection(SolutionItems) = preProject
+		coverlet.runsettings = coverlet.runsettings
 		src\Directory.Build.props = src\Directory.Build.props
 		.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
 		README.md = README.md

diff --git a/src/AssemblyMetadata.Generators/AssemblyMetadata.Generators.csproj b/src/AssemblyMetadata.Generators/AssemblyMetadata.Generators.csproj
@@ -2,16 +2,22 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <ImplicitUsings>true</ImplicitUsings>
+
+    <IsPackable>true</IsPackable>    
     <IsRoslynComponent>true</IsRoslynComponent>
+
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <NoPackageAnalysis>true</NoPackageAnalysis>
     <DevelopmentDependency>true</DevelopmentDependency>
-    <AnalyzerLanguage>cs</AnalyzerLanguage>
-    <AnalyzerRoslynVersion>4.3</AnalyzerRoslynVersion>
-    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" PrivateAssets="all" />
   </ItemGroup>
-
+
+  <ItemGroup>
+    <None Include="$(OutputPath)\AssemblyMetadata.Generators.dll" PackagePath="analyzers/dotnet/roslyn4.3/cs" Pack="true" Visible="false" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -16,13 +16,6 @@
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <DebugType>portable</DebugType>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-  </PropertyGroup>
-
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
     <ImplicitUsings>enable</ImplicitUsings>

diff --git a/test/AssemblyMetadata.Generators.Tests/AssemblyMetadata.Generators.Tests.csproj b/test/AssemblyMetadata.Generators.Tests/AssemblyMetadata.Generators.Tests.csproj
@@ -19,7 +19,6 @@
     <Copyright>Copyright © $([System.DateTime]::Now.ToString(yyyy)) LoreSoft</Copyright>
     <Authors>LoreSoft</Authors>
     <NeutralLanguage>en-US</NeutralLanguage>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>orm;sql;micro-orm;database</PackageTags>
     <PackageProjectUrl>https://github.com/loresoft/AssemblyMetadata.Generators</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>