Merge branch 'main' into feature/move-to-support-net-standard20

Author: matt-lethargic

.github/workflows/ci-build.yml

@@ -4,9 +4,19 @@ on:
   push:
   pull_request:
     branches: [ main ]
+  release:
+    types: 
+      - published
+
+env:
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+  DOTNET_CLI_TELEMETRY_OPTOUT: true
+
+  # Project name to pack and publish
+  PROJECT_NAME: GeoJSON.Text
 
 jobs:
-  Build:
+  build:
 
     name: 'Build and Test'
     runs-on: windows-latest
@@ -27,16 +37,19 @@ jobs:
             5.0.x
             6.0.x
       - name: Install dependencies
-        run: dotnet restore 
+        run: dotnet restore src/${{ env.PROJECT_NAME }}.sln
       - name: Build solution
-        run: dotnet build -c Release --no-restore /p:Version=1.2.3.4
+        run: dotnet build src/${{ env.PROJECT_NAME }}.sln -c Release --no-restore
       - name: Test
-        run: dotnet test -c Release --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:CoverletOutput=../coverage/
+        run: dotnet test src/${{ env.PROJECT_NAME }}.sln -c Release --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:CoverletOutput=../coverage/
       - uses: codecov/codecov-action@v2
         if: ${{ github.event_name == 'push' }}
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           directory: src/coverage
           flags: unittests
-          
-  
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: nupkg
+          path: src/${{ env.PROJECT_NAME }}/bin/Release/*.nupkg

.github/workflows/release.yml

@@ -0,0 +1,42 @@
+name: 'Build and Test' 
+
+on:
+  release:
+    types: 
+      - published
+
+env:
+  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+  DOTNET_CLI_TELEMETRY_OPTOUT: true
+  
+  # Project name to pack and publish
+  PROJECT_NAME: GeoJSON.Text
+
+   # Official NuGet Feed settings
+  NUGET_FEED: https://api.nuget.org/v3/index.json
+  NUGET_KEY: ${{ secrets.NUGET_KEY }}
+
+jobs:
+  deploy:
+    name: 'Deploy to Nuget'
+    if: github.event_name == 'release'
+    needs: build    
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup .NET Core
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: |
+            3.1.x
+            5.0.x
+            6.0.x
+      - name: Create Release NuGet package
+        run: |
+          arrTag=(${GITHUB_REF//\// })
+          VERSION="${arrTag[2]}"
+          VERSION="${VERSION//v}"
+          dotnet pack -v normal -c Release --include-symbols --include-source -p:PackageVersion=$VERSION -o nupkg src/$PROJECT_NAME/$PROJECT_NAME.csproj
+      - name: Push to Nuget
+        run: dotnet nuget push nuget/*.nupkg --source https://api.nuget.org/v3/index.json --api-key ${{secrets.NUGET_KEY}} --skip-duplicate

key.snk

@@ -2,10 +2,11 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-	<TargetFrameworks>netcoreapp3.1;net5;net6</TargetFrameworks>
+	<TargetFrameworks>netstandard2.0;net5;net6</TargetFrameworks>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <SignAssembly>False</SignAssembly>
+	<LangVersion>Latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>

src/GeoJSON.Text.Test.Benchmark/GeoJSON.Text.Test.Benchmark.csproj

@@ -6,7 +6,7 @@
 		<Description>.Net types for the GeoJSON RFC to be used with System.Text.Json</Description>
 		<Authors>Matt Hunt</Authors>
 		<Company>GeoJSON.Text</Company>
-		<Copyright>Copyright © Matt Hunt, Xavier Fischer and Contributors, 2014 - 2021</Copyright>
+		<Copyright>Copyright © Matt Hunt  and Contributors, 2014 - 2021</Copyright>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Version>0.1.0</Version>
 		<PackageProjectUrl>https://github.com/GeoJSON-Net/GeoJSON.Text</PackageProjectUrl>
@@ -20,9 +20,16 @@
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 		<EmbedUntrackedSources>true</EmbedUntrackedSources>
 		<PublishRepositoryUrl>true</PublishRepositoryUrl>
-		
+		<SignAssembly>true</SignAssembly>
+		<AssemblyOriginatorKeyFile>../key.snk</AssemblyOriginatorKeyFile>
+		<DelaySign>false</DelaySign>
+
 	</PropertyGroup>
 
+	<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
+		<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+	</PropertyGroup>	
+
 	<ItemGroup>
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 		<PackageReference Include="System.Text.Json" Version="6.0.1" />