.net 6

bbtsoftware · Jan 4, 2023 · 1b770fe · 1b770fe
1 parent 3aa736c
commit 1b770fe
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -40,9 +40,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: |
-            2.1.x
-            6.0.x
+          dotnet-version: 6.0.x
 
       - name: Restore dependencies
         run: dotnet restore

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -52,7 +52,7 @@ jobs:
         uses: NuGet/setup-nuget@v1
 
       - name: Package NuGet
-        run: nuget pack **\*.nuspec 
+        run: nuget pack **\*.nuspec
 
       - name: Publish NuGet
         run: nuget push **\*.nupkg -Source 'https://api.nuget.org/v3/index.json' -ApiKey ${{secrets.NUGETORG}}
diff --git a/src/BBT.MaybePattern/BBT.MaybePattern.csproj b/src/BBT.MaybePattern/BBT.MaybePattern.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyTitle>BBT.MaybePattern</AssemblyTitle>
     <Company>BBT Software AG</Company>
     <Product>BBT.Maybe</Product>
@@ -21,17 +21,6 @@
     <DebugType>pdbonly</DebugType>
   </PropertyGroup>
 
-  <!-- Workaround for malformed XML file in .NET Standard 2.0
-  (https://github.com/dotnet/standard/issues/1527) -->
-  <!-- <PropertyGroup Condition="'$(TargetFramework)'=='net7.0'">
-	  <NoWarn>$(NoWarn);IDT001</NoWarn>
-  </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
-    <InheritDocReference
-  Include="$([MSBuild]::EnsureTrailingSlash('$(NugetPackageRoot)'))netstandard.library.ref\2.1.0\ref\net7.0\netstandard.xml"
-  />
-  </ItemGroup> -->
-
   <ItemGroup>
     <PackageReference Include="SauceControl.InheritDoc" Version="1.3.0">
       <PrivateAssets>all</PrivateAssets>