Skip to content

Commit 38e9f8c

Browse files
authored
Merge pull request #5 from jltrem/feature/nuget-build-targets
Improve nuget dependencies
2 parents 21952ec + 5ad1685 commit 38e9f8c

File tree

5 files changed

+29
-27
lines changed

5 files changed

+29
-27
lines changed

.github/workflows/nuget-publish.yml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ on:
66
- main
77
tags:
88
- 'v*.*.*' # Publish on new version tags
9-
9+
- 'gen-v*.*.*'
10+
1011
pull_request: # Run the workflow on pull requests targeting main
1112
branches:
1213
- main
@@ -54,17 +55,24 @@ jobs:
5455
with:
5556
dotnet-version: 8.0.x
5657

58+
- name: Determine Project to Publish
59+
id: determine_project
60+
run: |
61+
# Extract project type from tag name
62+
if [[ "${GITHUB_REF##*/}" == "gen-v"* ]]; then
63+
echo "project=Refine.Generators" >> $GITHUB_ENV
64+
else
65+
echo "project=Refine" >> $GITHUB_ENV
66+
fi
67+
5768
- name: Restore dependencies
5869
run: dotnet restore
5970

60-
- name: Build projects
61-
run: dotnet build --configuration Release
62-
63-
- name: Pack Refine
64-
run: dotnet pack src/Refine/Refine.csproj --configuration Release --output ./packages
71+
- name: Build Project
72+
run: dotnet build --configuration Release src/${{ env.project }}/${{ env.project }}.csproj
6573

66-
- name: Pack Refine.Generators
67-
run: dotnet pack src/Refine.Generators/Refine.Generators.csproj --configuration Release --output ./packages
74+
- name: Pack Project
75+
run: dotnet pack src/${{ env.project }}/${{ env.project }}.csproj --configuration Release --output ./packages
6876

6977
- name: Publish to NuGet.org
7078
env:

samples/RefinedType.Console/RefinedType.Console.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<RootNamespace>Sample</RootNamespace>
9+
10+
<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
11+
912
</PropertyGroup>
1013

1114
<ItemGroup>

src/Refine.Generators/Refine.Generators.csproj

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
<LangVersion>8</LangVersion>
55
<Nullable>enable</Nullable>
66
<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
7+
<IncludeBuildOutput>false</IncludeBuildOutput>
78
</PropertyGroup>
89

910
<PropertyGroup>
1011
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1112
<PackageId>Refine.Generators</PackageId>
12-
<Version>0.0.4</Version>
13+
<Version>0.0.0</Version>
1314
<Authors>Joe Tremblay</Authors>
1415
<Company />
1516
<Copyright>Copyright © 2025 Joe Tremblay</Copyright>
@@ -19,26 +20,27 @@
1920
<PackageTags>validator;validate;validation;transformation;types;immutable;ddd;domain;dotnet;roslyn;codegen</PackageTags>
2021
<RepositoryUrl>https://github.com/jltrem/refine</RepositoryUrl>
2122
<PackageProjectUrl>https://github.com/jltrem/refine</PackageProjectUrl>
23+
<PackageReadmeFile>README.md</PackageReadmeFile>
2224
</PropertyGroup>
2325

2426
<PropertyGroup>
25-
<MinVerTagPrefix>v</MinVerTagPrefix>
27+
<MinVerTagPrefix>gen-v</MinVerTagPrefix>
2628
<MinVerDefaultPreReleaseIdentifiers>preview.0</MinVerDefaultPreReleaseIdentifiers>
2729
</PropertyGroup>
2830

2931
<ItemGroup>
3032
<None Include="../../README.md" Pack="true" PackagePath="\"/>
3133
</ItemGroup>
32-
34+
3335
<ItemGroup>
3436
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4">
3537
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3638
<PrivateAssets>all</PrivateAssets>
3739
</PackageReference>
38-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0"/>
40+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0" PrivateAssets="all" />
3941
<PackageReference Include="MinVer" Version="6.0.0">
40-
<PrivateAssets>all</PrivateAssets>
41-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
42+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
43+
<PrivateAssets>all</PrivateAssets>
4244
</PackageReference>
4345
</ItemGroup>
4446

src/Refine.Generators/RefinedTypeGenerator.cs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -152,18 +152,6 @@ private static void GenerateWrapperCode(SourceProductionContext context, Immutab
152152
{
153153
foreach (var wrapper in wrappers)
154154
{
155-
//var targetTypeSymbol = (INamedTypeSymbol)wrapper.TargetType;
156-
//var isRecord = targetTypeSymbol.IsRecord;
157-
158-
context.ReportDiagnostic(Diagnostic.Create(
159-
new DiagnosticDescriptor(
160-
"GEN002",
161-
"dump",
162-
$"{wrapper}",
163-
"SourceGenerator",
164-
DiagnosticSeverity.Warning,
165-
true),
166-
Location.None));
167155
var sourceCode = GenerateWrapperSource(wrapper);
168156

169157
context.AddSource($"{wrapper.ClassName}.g.cs", SourceText.From(sourceCode, Encoding.UTF8));

src/Refine/Refine.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PropertyGroup>
1111
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1212
<PackageId>Refine</PackageId>
13-
<Version>0.0.4</Version>
13+
<Version>0.0.0</Version>
1414
<Authors>Joe Tremblay</Authors>
1515
<Company />
1616
<Copyright>Copyright © 2025 Joe Tremblay</Copyright>
@@ -20,6 +20,7 @@
2020
<PackageTags>validator;validate;validation;transformation;types;immutable;ddd;domain;dotnet;roslyn;codegen</PackageTags>
2121
<RepositoryUrl>https://github.com/jltrem/refine</RepositoryUrl>
2222
<PackageProjectUrl>https://github.com/jltrem/refine</PackageProjectUrl>
23+
<PackageReadmeFile>README.md</PackageReadmeFile>
2324
</PropertyGroup>
2425

2526
<PropertyGroup>

0 commit comments

Comments
 (0)