Skip to content

Commit 60712d4

Browse files
committed
cleanup build
1 parent 857a82e commit 60712d4

File tree

5 files changed

+13
-33
lines changed

5 files changed

+13
-33
lines changed

.github/workflows/dotnet.yml

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -33,34 +33,15 @@ jobs:
3333
with:
3434
dotnet-version: 7.0.x
3535

36-
- name: Calculate Version
37-
run: |
38-
dotnet tool update -g minver-cli
39-
echo "BUILD_VERSION=$(minver -v e -t v)" >> $GITHUB_ENV
40-
4136
- name: Restore Dependencies
4237
run: dotnet restore
4338

4439
- name: Build Solution
45-
run: 'dotnet build --no-restore --configuration Release -p:Version="${{env.BUILD_VERSION}}" -p:InformationalVersion="${{env.BUILD_VERSION}}+${{github.sha}}"'
40+
run: 'dotnet build --no-restore --configuration Release'
4641

4742
- name: Run Test
4843
run: dotnet test --no-build --configuration Release --collect:"XPlat Code Coverage" --settings coverlet.runsettings
4944

50-
- name: Generate Coverage
51-
uses: danielpalme/[email protected]
52-
with:
53-
reports: '${{github.workspace}}/test/*/TestResults/*/coverage.info'
54-
targetdir: ${{env.BUILD_PATH}}
55-
reporttypes: lcov
56-
57-
- name: Report Coverage
58-
if: success()
59-
uses: coverallsapp/github-action@v2
60-
with:
61-
file: artifacts/lcov.info
62-
format: lcov
63-
6445
- name: Create Packages
6546
if: success() && github.event_name != 'pull_request'
6647
run: dotnet pack --configuration Release --include-symbols --include-source --no-build --no-restore --output "${{env.BUILD_PATH}}"

AssemblyMetadata.Generators.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyMetadata.Generators
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{1BA030F4-6549-4F95-ACEA-80E992C519BD}"
99
ProjectSection(SolutionItems) = preProject
10+
coverlet.runsettings = coverlet.runsettings
1011
src\Directory.Build.props = src\Directory.Build.props
1112
.github\workflows\dotnet.yml = .github\workflows\dotnet.yml
1213
README.md = README.md

src/AssemblyMetadata.Generators/AssemblyMetadata.Generators.csproj

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,22 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5-
<ImplicitUsings>true</ImplicitUsings>
5+
6+
<IsPackable>true</IsPackable>
67
<IsRoslynComponent>true</IsRoslynComponent>
8+
9+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
10+
<IncludeBuildOutput>false</IncludeBuildOutput>
11+
<NoPackageAnalysis>true</NoPackageAnalysis>
712
<DevelopmentDependency>true</DevelopmentDependency>
8-
<AnalyzerLanguage>cs</AnalyzerLanguage>
9-
<AnalyzerRoslynVersion>4.3</AnalyzerRoslynVersion>
10-
<LangVersion>latest</LangVersion>
1113
</PropertyGroup>
1214

1315
<ItemGroup>
1416
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" PrivateAssets="all" />
1517
</ItemGroup>
16-
18+
19+
<ItemGroup>
20+
<None Include="$(OutputPath)\AssemblyMetadata.Generators.dll" PackagePath="analyzers/dotnet/roslyn4.3/cs" Pack="true" Visible="false" />
21+
</ItemGroup>
22+
1723
</Project>

src/Directory.Build.props

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@
1616
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1717
</PropertyGroup>
1818

19-
<PropertyGroup>
20-
<DebugType>portable</DebugType>
21-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
22-
<IncludeSymbols>true</IncludeSymbols>
23-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
24-
</PropertyGroup>
25-
2619
<PropertyGroup>
2720
<LangVersion>latest</LangVersion>
2821
<ImplicitUsings>enable</ImplicitUsings>

test/AssemblyMetadata.Generators.Tests/AssemblyMetadata.Generators.Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<Copyright>Copyright © $([System.DateTime]::Now.ToString(yyyy)) LoreSoft</Copyright>
2020
<Authors>LoreSoft</Authors>
2121
<NeutralLanguage>en-US</NeutralLanguage>
22-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
2322
<PackageTags>orm;sql;micro-orm;database</PackageTags>
2423
<PackageProjectUrl>https://github.com/loresoft/AssemblyMetadata.Generators</PackageProjectUrl>
2524
<PackageLicenseExpression>MIT</PackageLicenseExpression>

0 commit comments

Comments
 (0)