🔖Version Bump 0.2.5 with .NET5 and C#9 (#66)

Co-authored-by: Joscha Metze <joscha.metze@hochfrequenz.de>
Hochfrequenz · May 20, 2021 · 20df289 · 20df289
1 parent 3f81b8f
commit 20df289
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 18 deletions.
diff --git a/.github/workflows/feature_branches.yml b/.github/workflows/feature_branches.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 3.1.100
+          dotnet-version: 5.0.100
       - name: Build/Check for compile errors (dotnet build)
         run: dotnet build --configuration Release --version-suffix "${{github.sha}}"
       - name: Run Unit Tests (dotnet test)
@@ -30,7 +30,7 @@ jobs:
         run: dotnet pack --configuration Release --version-suffix "${{github.sha}}"
       - name: Nuget push core
         run: |
-          for f in ./BO4E-dotnet/bin/Release/*.nupkg
+          for f in /home/runner/work/BO4E-dotnet/BO4E-dotnet/BO4E/bin/Release/*.nupkg
           do
             curl -vX PUT -u "[user]:${{ secrets.GITHUB_TOKEN }}" -F package=@$f https://nuget.pkg.github.com/hochfrequenz/
           done
diff --git a/.github/workflows/formatter.yml b/.github/workflows/formatter.yml
@@ -10,7 +10,7 @@ jobs:
       - name: Setup .NET 3.1
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "3.1.x"
+          dotnet-version: 5.0.100
       - name: Install dotnet-format
         run: |
           dotnet tool install -g dotnet-format

diff --git a/.github/workflows/nuget_package_push.yml b/.github/workflows/nuget_package_push.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 3.1.100
+          dotnet-version: 5.0.100
       - name: Build/Check for compile errors (dotnet build)
         run: dotnet build --configuration Release
       - name: Run Unit Tests (dotnet test)

diff --git a/.github/workflows/nuget_package_push_prerelease.yml b/.github/workflows/nuget_package_push_prerelease.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 3.1.100
+          dotnet-version: 5.0.100
       - name: Build/Check for compile errors (dotnet build)
         run: dotnet build --configuration Release --version-suffix "beta${{ steps.current-time.outputs.formattedTime }}"
       - name: Run Unit Tests (dotnet test)

diff --git a/.github/workflows/run_unit_tests_only.yml b/.github/workflows/run_unit_tests_only.yml
@@ -10,6 +10,6 @@ jobs:
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 3.1.100
+          dotnet-version: 5.0.100
       - name: Run Tests
         run: dotnet test --configuration Release
diff --git a/.gitignore b/.gitignore
@@ -59,3 +59,7 @@ TestBO4E.Extensions/bin/
 
 TestBO4E.Reporting/obj/
 TestBO4E.Reporting/bin/
+
+BO4E/bin/Debug/netstandard2.0/
+
+BO4E/bin/Debug/net5.0/
diff --git a/BO4E-dotnet.Encryption/BO4E.Encryption.csproj b/BO4E-dotnet.Encryption/BO4E.Encryption.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>BO4E_dotnet.Encryption</RootNamespace>
 	<VersionPrefix>0.2.3</VersionPrefix>
 	<VersionSuffix>$(VersionSuffix)</VersionSuffix>
@@ -12,6 +12,8 @@
     <Authors />
     <Company>Hochfrequenz Unternehmensberatung GmbH</Company>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <LangVersion>9</LangVersion>
+    <PackageVersion>0.2.5</PackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/BO4E.Extensions/BO4E.Extensions.csproj b/BO4E.Extensions/BO4E.Extensions.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>BO4E_dotnet.Extensions</RootNamespace>
     <VersionPrefix>0.2.3</VersionPrefix>
     <VersionSuffix>$(VersionSuffix)</VersionSuffix>
@@ -11,6 +10,9 @@
     <PackageId>Hochfrequenz.BO4E.Extensions</PackageId>
     <Authors>Hochfrequenz Unternehmensberatung GmbH</Authors>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <LangVersion>9</LangVersion>
+    <PackageVersion>0.2.5</PackageVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/BO4E.Reporting/BO4E.Reporting.csproj b/BO4E.Reporting/BO4E.Reporting.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>BO4E_dotnet.Reporting</RootNamespace>
     <VersionPrefix>0.2.3</VersionPrefix>
     <VersionSuffix>$(VersionSuffix)</VersionSuffix>
@@ -19,6 +18,9 @@
     <!-- Optional: Include PDB in the built .nupkg -->
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <LangVersion>9</LangVersion>
+    <PackageVersion>0.2.5</PackageVersion>
+    <TargetFramework>net5.0</TargetFramework>
 
   </PropertyGroup>
 

diff --git a/BO4E/BO4E.csproj b/BO4E/BO4E.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>BO4E</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageId>Hochfrequenz.BO4Enet</PackageId>
@@ -21,14 +21,15 @@
     <PackageProjectUrl>https://github.com/Hochfrequenz/BO4E-dotnet/</PackageProjectUrl>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
-    <AssemblyVersion>0.2.4.0</AssemblyVersion>
-    <FileVersion>0.2.4.0</FileVersion>
+    <AssemblyVersion>0.2.5.0</AssemblyVersion>
+    <FileVersion>0.2.5.0</FileVersion>
 
     <RepositoryType>git</RepositoryType>
     <IncludeSymbols>true</IncludeSymbols>
     <DebugType>Embedded</DebugType>
     <EmbedAllSources>True</EmbedAllSources>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>9</LangVersion>
+    <PackageVersion>0.2.5</PackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

diff --git a/BO4E/COM/Verbrauch.cs b/BO4E/COM/Verbrauch.cs
@@ -154,7 +154,7 @@ public void FixSapCdsBug()
         {
             //using (MiniProfiler.Current.Step("FixSapCdsBug (Verbrauch)")) // don't do this. it slows down everything !
             // {
-            if (Startdatum != null && Enddatum != null && Startdatum > Enddatum)
+            if (Startdatum > Enddatum)
             {
                 var diff = Startdatum - Enddatum;
                 if (diff.Hours <= 25 && diff.Hours >= 23 && diff.Minutes == 45 && Startdatum.Hour >= 22 &&

diff --git a/BO4ETestProject/TestBO4E.csproj b/BO4ETestProject/TestBO4E.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
 

diff --git a/TestBO4E-dotnet-Encryption/TestBO4E.Encryption.csproj b/TestBO4E-dotnet-Encryption/TestBO4E.Encryption.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>TestBO4E_dotnet_Encryption</RootNamespace>
 
     <IsPackable>false</IsPackable>

diff --git a/TestBO4E.Extensions/TestBO4E.Extensions.csproj b/TestBO4E.Extensions/TestBO4E.Extensions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>TestBO4E_dotnet_Extensions</RootNamespace>
 
     <IsPackable>false</IsPackable>

diff --git a/TestBO4E.Reporting/TestBO4E.Reporting.csproj b/TestBO4E.Reporting/TestBO4E.Reporting.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>TestBO4E_dotnet_Reporting</RootNamespace>
 
     <IsPackable>false</IsPackable>