Update to dotnet 8 rc 2

bitfoundation · Oct 24, 2023 · 6e17c6d · 6e17c6d
1 parent 75fa263
commit 6e17c6d
Show file tree

Hide file tree

Showing 61 changed files with 172 additions and 691 deletions.
diff --git a/Samples/BitChangeSetManager/AspNetCore/BitChangeSetManager.csproj b/Samples/BitChangeSetManager/AspNetCore/BitChangeSetManager.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<TypeScriptToolsVersion>4.5</TypeScriptToolsVersion>
 		<!--<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>-->
 	</PropertyGroup>
@@ -13,16 +13,16 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Bit.Server.Data.EntityFramework" Version="13.5.0" />
-		<PackageReference Include="Bit.Server.Hangfire" Version="13.5.0" />
-		<PackageReference Include="Bit.Server.IdentityServer" Version="13.5.0" />
-		<PackageReference Include="Bit.Server.OData" Version="13.5.0" />
-		<PackageReference Include="Bit.Server.Owin" Version="13.5.0" />
-		<PackageReference Include="Bit.Server.Signalr" Version="13.5.0" />
-		<PackageReference Include="Bit.Tooling.CodeAnalyzer" Version="13.5.0" />
-		<PackageReference Include="Bit.Tooling.CodeGenerator.Task" Version="13.5.0" />
-		<PackageReference Include="Bit.Universal.AutoMapper" Version="13.5.0" />
-		<PackageReference Include="Dapper" Version="2.0.143" />
+		<PackageReference Include="Bit.Server.Data.EntityFramework" Version="14.0.0" />
+		<PackageReference Include="Bit.Server.Hangfire" Version="14.0.0" />
+		<PackageReference Include="Bit.Server.IdentityServer" Version="14.0.0" />
+		<PackageReference Include="Bit.Server.OData" Version="14.0.0" />
+		<PackageReference Include="Bit.Server.Owin" Version="14.0.0" />
+		<PackageReference Include="Bit.Server.Signalr" Version="14.0.0" />
+		<PackageReference Include="Bit.Tooling.CodeAnalyzer" Version="14.0.0" />
+		<PackageReference Include="Bit.Tooling.CodeGenerator.Task" Version="14.0.0" />
+		<PackageReference Include="Bit.Universal.AutoMapper" Version="14.0.0" />
+		<PackageReference Include="Dapper" Version="2.1.15" />
 	</ItemGroup>
 
 </Project>
diff --git a/Samples/DataAccessSamples/EntityFrameworkCoreSample/EntityFrameworkCoreSample.csproj b/Samples/DataAccessSamples/EntityFrameworkCoreSample/EntityFrameworkCoreSample.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Bit.Server.Data.EntityFrameworkCore" Version="13.5.0" />
-    <PackageReference Include="Bit.Server.WebApi" Version="13.5.0" />
-    <PackageReference Include="Bit.Tooling.CodeAnalyzer" Version="13.5.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.10" />
+    <PackageReference Include="Bit.Server.Data.EntityFrameworkCore" Version="14.0.0" />
+    <PackageReference Include="Bit.Server.WebApi" Version="14.0.0" />
+    <PackageReference Include="Bit.Tooling.CodeAnalyzer" Version="14.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-rc.2.23480.1" />
   </ItemGroup>
   <ItemGroup>
     <Content Update="environments.json">

diff --git a/Samples/DataAccessSamples/EntityFrameworkSample/EntityFrameworkSample.csproj b/Samples/DataAccessSamples/EntityFrameworkSample/EntityFrameworkSample.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Bit.Server.Data.EntityFramework" Version="13.5.0" />
-    <PackageReference Include="Bit.Server.WebApi" Version="13.5.0" />
-    <PackageReference Include="Bit.Tooling.CodeAnalyzer" Version="13.5.0" />
+    <PackageReference Include="Bit.Server.Data.EntityFramework" Version="14.0.0" />
+    <PackageReference Include="Bit.Server.WebApi" Version="14.0.0" />
+    <PackageReference Include="Bit.Tooling.CodeAnalyzer" Version="14.0.0" />
     <PackageReference Include="EntityFramework" Version="6.4.4" />
   </ItemGroup>
   <ItemGroup>

diff --git a/Samples/ODataSamples/CustomerDtoControllerSample/CustomerDtoControllerSample.csproj b/Samples/ODataSamples/CustomerDtoControllerSample/CustomerDtoControllerSample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
 	</PropertyGroup>
 
@@ -11,10 +11,10 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Bit.Server.Data.EntityFramework" Version="13.5.0" />
-		<PackageReference Include="Bit.Server.OData" Version="13.5.0" />
-		<PackageReference Include="Bit.Tooling.CodeAnalyzer" Version="13.5.0" />
-		<PackageReference Include="Bit.Universal.AutoMapper" Version="13.5.0" />
+		<PackageReference Include="Bit.Server.Data.EntityFramework" Version="14.0.0" />
+		<PackageReference Include="Bit.Server.OData" Version="14.0.0" />
+		<PackageReference Include="Bit.Tooling.CodeAnalyzer" Version="14.0.0" />
+		<PackageReference Include="Bit.Universal.AutoMapper" Version="14.0.0" />
 	</ItemGroup>
 
 </Project>
diff --git a/Samples/WebApiSamples/WebApiSample/WebApiSample.csproj b/Samples/WebApiSamples/WebApiSample/WebApiSample.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AssemblyName>WebApiSample</AssemblyName>
     <RootNamespace>WebApiSample</RootNamespace>
     <UserSecretsId>075bb9c1-05ff-404a-ac1f-5670bb5bd331</UserSecretsId>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Bit.Server.WebApi" Version="13.5.0" />
-    <PackageReference Include="Bit.Tooling.CodeAnalyzer" Version="13.5.0" />
-    <PackageReference Include="Bit.Universal.AutoMapper" Version="13.5.0" />
+    <PackageReference Include="Bit.Server.WebApi" Version="14.0.0" />
+    <PackageReference Include="Bit.Tooling.CodeAnalyzer" Version="14.0.0" />
+    <PackageReference Include="Bit.Universal.AutoMapper" Version="14.0.0" />
   </ItemGroup>
   <ItemGroup>
     <Content Update="environments.json">

diff --git a/...ntityFrameworkOptimizedForNTierScenarios/EntityFrameworkOptimizedForNTierScenarios.csproj b/...ntityFrameworkOptimizedForNTierScenarios/EntityFrameworkOptimizedForNTierScenarios.csproj
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.13.7" />
-    <PackageReference Include="Bit.Server.Data.EntityFramework" Version="13.5.0" />
-    <PackageReference Include="Bit.Server.WebApi" Version="13.5.0" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.9" />
+    <PackageReference Include="Bit.Server.Data.EntityFramework" Version="14.0.0" />
+    <PackageReference Include="Bit.Server.WebApi" Version="14.0.0" />
     <PackageReference Include="Bit.System.Diagnostics.CodeAnalysis" Version="1.0.0" />
     <PackageReference Include="SharpRepository.EfRepository" Version="2.1.3" />
   </ItemGroup>

diff --git a/src/Bit.Build.props b/src/Bit.Build.props
@@ -26,7 +26,7 @@
 		<PackageIconUrl>https://avatars.githubusercontent.com/u/22663390</PackageIconUrl>
 
 
-        <ReleaseVersion>13.6.0</ReleaseVersion>
+        <ReleaseVersion>14.0.0</ReleaseVersion>
 
         <PackageReleaseNotes>https://github.com/bitfoundation/bitplatform/releases/tag/v-$(ReleaseVersion)</PackageReleaseNotes>
         <PackageVersion>$(ReleaseVersion)</PackageVersion>
@@ -43,33 +43,14 @@
 		<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
 		<EmbedAllSources>True</EmbedAllSources>
 		<DebugType>portable</DebugType>
-		<DefineConstants Condition=" '$(TargetFramework)' == 'monoandroid12.0' OR '$(TargetFramework)' == 'net7.0-android' ">$(DefineConstants);Android</DefineConstants>
-		<DefineConstants Condition=" '$(TargetFramework)' == 'Xamarin.iOS10' OR '$(TargetFramework)' == 'net7.0-ios' ">$(DefineConstants);iOS</DefineConstants>
-		<DefineConstants Condition=" '$(TargetFramework)' == 'net7.0' ">$(DefineConstants);DotNet</DefineConstants>
-        <DefineConstants Condition=" '$(TargetFramework)' == 'uap10.0.17763' OR '$(TargetFramework)' == 'net7.0-windows10.0.19041' ">$(DefineConstants);UWP</DefineConstants>
-        <DefineConstants Condition=" '$(TargetFramework)' == 'net7.0-maccatalyst' ">$(DefineConstants);Mac</DefineConstants>
-		<DefineConstants Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(DefineConstants);DotNetStandard;DotNetStandard2_0</DefineConstants>
-		<DefineConstants Condition=" '$(TargetFramework)' == 'netstandard2.1' ">$(DefineConstants);DotNetStandard;DotNetStandard2_1</DefineConstants>
-        <DefineConstants Condition=" '$(TargetFramework)' == 'monoandroid12.0' OR '$(TargetFramework)' == 'Xamarin.iOS10' OR '$(TargetFramework)' == 'uap10.0.17763' ">$(DefineConstants);Xamarin</DefineConstants>
-        <DefineConstants Condition=" '$(TargetFramework)' == 'net7.0-android' OR '$(TargetFramework)' == 'net7.0-ios' OR '$(TargetFramework)' == 'net7.0-windows10.0.19041' ">$(DefineConstants);Maui</DefineConstants>
-        <UseMauiEssentials Condition=" '$(TargetFramework)' == 'net7.0-android' OR '$(TargetFramework)' == 'net7.0-ios' OR '$(TargetFramework)' == 'net7.0-windows10.0.19041' ">true</UseMauiEssentials>
-		<GenerateLibraryLayout Condition=" '$(TargetFramework)' == 'uap10.0.17763' OR '$(TargetFramework)' == 'net7.0-windows10.0.19041' ">true</GenerateLibraryLayout>
-		<DesignTimeBuild>True</DesignTimeBuild>
-		<AndroidResgenFile>False</AndroidResgenFile>
-		<AndroidUseIntermediateDesignerFile>False</AndroidUseIntermediateDesignerFile>
+		<DefineConstants Condition=" '$(TargetFramework)' == 'net8.0' ">$(DefineConstants);DotNet</DefineConstants>
 		<ProduceReferenceAssembly>True</ProduceReferenceAssembly>
 
-		<TargetFrameworkVersion Condition=" '$(TargetFramework)' == 'monoandroid12.0' ">v10.0</TargetFrameworkVersion>
-		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-ios'">12.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-maccatalyst'">12.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-android'">21.0</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</SupportedOSPlatformVersion>
-		<TargetPlatformMinVersion Condition="$(TargetFramework.Contains('-windows'))">10.0.17763.0</TargetPlatformMinVersion>
-
 		<AnalysisLevel>latest</AnalysisLevel>
 		<AnalysisMode>AllEnabledByDefault</AnalysisMode>
 		<EnableNETAnalyzers>true</EnableNETAnalyzers>
 		<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+        <UseRidGraph>true</UseRidGraph>
 	</PropertyGroup>
 
 	<PropertyGroup Condition="'$(Configuration)'=='Debug'">
@@ -85,22 +66,6 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-		<PackageReference Include="MSBuild.Sdk.Extras" Version="3.0.44" PrivateAssets="All" />
-	</ItemGroup>
-
-	<ItemGroup Condition=" '$(TargetFramework)' == 'monoandroid12.0'">
-		<Reference Include="System.ComponentModel.DataAnnotations" />
-		<Reference Include="System.Data" />
 	</ItemGroup>
 
-	<ItemGroup Condition=" '$(TargetFramework)' == 'Xamarin.iOS10' ">
-		<Reference Include="System.ComponentModel.DataAnnotations" />
-		<Reference Include="System.Data" />
-		<PackageReference Include="System.Reflection.Emit" Version="4.3.0" ExcludeAssets="All">
-			<IncludeAssets>none</IncludeAssets>
-		</PackageReference>
-	</ItemGroup>
-
-	<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
-
 </Project>