update dotnet6

TurnerSoftware · Dec 27, 2021 · 92afe54 · 92afe54
1 parent 4474fa7
commit 92afe54
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 21 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,10 +1,10 @@
 version: 'Build {build}'
-image: Visual Studio 2019
+image: Visual Studio 2022
 skip_branch_with_pr: true
 
 services:
   - mongodb
-  
+
 build_script:
   - ps: dotnet restore
   - ps: dotnet build --no-restore -c Release

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -22,11 +22,11 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-    <PackageReference Include="TurnerSoftware.BuildVersioning" Version="0.3.0" PrivateAssets="All" />
+    <PackageReference Include="TurnerSoftware.BuildVersioning" Version="0.4.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
     <None Include="..\..\images\$(PackageIcon)" Pack="true" PackagePath="/" />
   </ItemGroup>
-  
+
 </Project>
diff --git a/src/MongoFramework.Profiling.MiniProfiler/MongoFramework.Profiling.MiniProfiler.csproj b/src/MongoFramework.Profiling.MiniProfiler/MongoFramework.Profiling.MiniProfiler.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0; net5.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0; net5.0;net6.0</TargetFrameworks>
     <AssemblyName>MongoFramework.Profiling.MiniProfiler</AssemblyName>
     <Title>MiniProfiler for MongoFramework</Title>
     <Description>MongoFramework integration for MiniProfiler</Description>

diff --git a/src/MongoFramework/MongoFramework.csproj b/src/MongoFramework/MongoFramework.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0; net5.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net5.0;net6.0</TargetFrameworks>
     <AssemblyName>MongoFramework</AssemblyName>
     <Title>MongoFramework</Title>
     <Description>An "Entity Framework"-like interface for the MongoDB C# Driver</Description>
@@ -14,20 +14,20 @@
   </ItemGroup>
 
   <Choose>
-    <When Condition=" '$(TargetFramework)' == 'net5.0' ">
+    <When Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
       <ItemGroup>
-        <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
-        <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
-        <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="5.0.0" />
-        <PackageReference Include="System.Linq.Async" Version="5.0.0" />
+        <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
+        <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
+        <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
+        <PackageReference Include="System.Linq.Async" Version="4.1.1" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
-        <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
-        <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.1" />
-        <PackageReference Include="System.Linq.Async" Version="4.1.1" />
+        <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
+        <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
+        <PackageReference Include="System.Linq.Async" Version="5.1.0" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/tests/MongoFramework.Benchmarks/MongoFramework.Benchmarks.csproj b/tests/MongoFramework.Benchmarks/MongoFramework.Benchmarks.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <IsPackable>False</IsPackable>
   </PropertyGroup>
 

diff --git a/tests/MongoFramework.Tests/MongoFramework.Tests.csproj b/tests/MongoFramework.Tests/MongoFramework.Tests.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <AssemblyName>MongoFramework.Tests</AssemblyName>
     <RootNamespace>MongoFramework.Tests</RootNamespace>
-    <TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
@@ -20,19 +20,18 @@
   </ItemGroup>
 
   <Choose>
-    <When Condition=" '$(TargetFramework)' == 'net5.0' ">
+    <When Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
       <ItemGroup>
-        <PackageReference Include="System.Linq.Async" Version="5.0.0" />
+        <PackageReference Include="System.Linq.Async" Version="4.1.1" />
       </ItemGroup>
     </When>
     <Otherwise>
       <ItemGroup>
-        <PackageReference Include="System.Linq.Async" Version="4.1.1" />
+         <PackageReference Include="System.Linq.Async" Version="5.1.0" />
       </ItemGroup>
     </Otherwise>
   </Choose>
 
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\MongoFramework.Profiling.MiniProfiler\MongoFramework.Profiling.MiniProfiler.csproj" />
     <ProjectReference Include="..\..\src\MongoFramework\MongoFramework.csproj" />