Merge pull request #26 from nullfx/issue-25

Issue 25
nullfx · Jul 7, 2023 · 1af8704 · 1af8704
2 parents ac9f569 + 23736a0
commit 1af8704
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 16 deletions.
diff --git a/.github/workflows/cicd-actions.yml b/.github/workflows/cicd-actions.yml
@@ -24,12 +24,24 @@ jobs:
             3.1.x 
             6.0.x 
             7.0.x
+    - name: replace version tokens
+      uses: cschleiden/[email protected]
+      with:
+        files: '["**/*.csproj"]'
+      env:
+        RELEASE_VERSION: ${{ vars.RELEASE_VERSION }}
     - name: install dependencies
-      run: dotnet restore      
-    - name: build
-      run: dotnet build       
-    - name: test
+      run: dotnet restore
+    - name: build source
+      run: dotnet build -c Release       
+    - name: run tests
       run: dotnet test
+    - name: create nuget packages
+      run: dotnet pack -c Release -o ./out
+    - name: push nuget packages to github
+      run: dotnet nuget push "./out/NullFX.CRC.${{ vars.RELEASE_VERSION }}.nupkg" -s "https://nuget.pkg.github.com/nullfx/index.json" -k "${{ secrets.GITHUB_TOKEN }}"
+    - name: push nuget packages to nuget.org
+      run: dotnet nuget push "./out/NullFX.CRC.${{ vars.RELEASE_VERSION }}.nupkg" --skip-duplicate -s "https://api.nuget.org/v3/index.json"  -k "${{ secrets.NUGET_ORG_API_KEY }}"
     - name: Cache SonarCloud packages
       uses: actions/cache@v1
       with:

diff --git a/NullFX.CRC.Benchmarks/NullFX.CRC.Benchmarks.csproj b/NullFX.CRC.Benchmarks/NullFX.CRC.Benchmarks.csproj
@@ -2,13 +2,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFrameworks>net47;net48;netcoreapp3.1;net6.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;net47;net48;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
 		<IsPackable>false</IsPackable>
-		<ReleaseVersion>1.1.7</ReleaseVersion>
+		<!--when manually building this, replace #{RELEASE_VERSION}# with some .net version number like	1.1.1-->
+		<ReleaseVersion>#{RELEASE_VERSION}#</ReleaseVersion>
                 <SonarQubeExclude>true</SonarQubeExclude>
   </PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
+		<PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
 		<PackageReference Include="System.Data.HashFunction.CRC" Version="2.0.0" />
 	</ItemGroup>
 	<ItemGroup>

diff --git a/NullFX.CRC.Tests/NullFX.CRC.Tests.csproj b/NullFX.CRC.Tests/NullFX.CRC.Tests.csproj
@@ -3,7 +3,8 @@
     <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <IsPublishable>false</IsPublishable>
-    <ReleaseVersion>1.1.7</ReleaseVersion>
+    <!--when manually building this, replace #{RELEASE_VERSION}# with some .net version number like	1.1.1-->
+    <ReleaseVersion>#{RELEASE_VERSION}#</ReleaseVersion>
     <SonarQubeExclude>true</SonarQubeExclude>
   </PropertyGroup>
   <ItemGroup>

diff --git a/NullFX.CRC/NullFX.CRC.csproj b/NullFX.CRC/NullFX.CRC.csproj
@@ -1,31 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net40;net45;net46;net47;net48;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;net40;net45;net46;net47;net48;netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
 		<AssemblyName>NullFX.CRC</AssemblyName>
 		<Description>NullFX CRC is a small set of CRC utilities (crc8, crc16, and crc32) written in C# and released under the MIT License</Description>
-		<Copyright>2022 Steve Whitley</Copyright>
+		<Copyright>2023 Steve Whitley</Copyright>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>Steve Whitley</Authors>
 		<Company>NullFX Software</Company>
 		<PackageTags>CRC8 CRC16 CRC32</PackageTags>
 		<PackageProjectUrl>https://github.com/nullfx/NullFX.CRC</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/nullfx/NullFX.CRC</RepositoryUrl>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
-		<PackageVersion>1.1.7</PackageVersion>
 		<Owners>Steve Whitley</Owners>
 		<Summary>NullFX CRC is a small set of CRC utilities (crc8, crc16, and crc32) written in C# and released under the MIT License</Summary>
 		<Title>NullFX CRC</Title>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
 		<IncludeSymbols>true</IncludeSymbols>
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
-		<AssemblyVersion>1.1.7.0</AssemblyVersion>
-		<FileVersion>1.1.7.0</FileVersion>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
-		<Version>1.1.7</Version>
-		<ReleaseVersion>1.1.7</ReleaseVersion>
 		<Configurations>Release;Debug</Configurations>
 		<SonarQubeTestProject>True</SonarQubeTestProject>
+		<!--when manually building this, replace #{RELEASE_VERSION}# with some .net version number like	1.1.1-->
+		<PackageVersion>#{RELEASE_VERSION}#</PackageVersion>
+		<AssemblyVersion>#{RELEASE_VERSION}#.0</AssemblyVersion>
+		<FileVersion>#{RELEASE_VERSION}#.0</FileVersion>
+		<Version>#{RELEASE_VERSION}#</Version>
+		<ReleaseVersion>#{RELEASE_VERSION}#</ReleaseVersion>
 	</PropertyGroup>
 	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
 		<DebugType>

diff --git a/README.md b/README.md
@@ -11,7 +11,7 @@ NullFX CRC is a small set of CRC utilities written in native C# released under t
 ## Install
 
 ```sh
-dotnet add PROJECT package NullFX.CRC --version 1.1.7
+dotnet add PROJECT package NullFX.CRC --version 1.1.8
 ```
 
 ## Examples: