feat!: Update to dotnet 7

nventive · Nov 23, 2023 · 2167b8d · 2167b8d
1 parent e036c80
commit 2167b8d
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 25 deletions.
diff --git a/BREAKING_CHANGES.md b/BREAKING_CHANGES.md
@@ -1 +1,6 @@
-# Breaking Changes
+# Breaking Changes
+
+## 2.0.0
+
+* Added support .net 7
+* Dropped support for .net 6
diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
@@ -3,11 +3,6 @@ trigger:
     include:
     - main
 
-resources:
-   containers:
-     - container: windows
-       image: nventive/vs_build-tools:17.2.5
-
 variables:
 - name: NUGET_VERSION
   value: 6.2.0
@@ -29,8 +24,8 @@ variables:
   value: nventive.internal.p12 # This is the certificate from the entreprise account used to sign internal builds.
 - name:  InternalKeystore
   value: com.nventive.internal.applicationtemplate.jks
-- name: windowsPoolName
-  value: 'windows 2022'
+- name: windowsHostedAgentImage
+  value: 'windows-2022'
 
 stages:
 - stage: Build
@@ -45,7 +40,7 @@ stages:
           GeneratePackageOnBuild: true
 
     pool:
-      name: $(windowsPoolName)
+      vmImage: $(windowsHostedAgentImage)
 
     variables:
     - name: PackageOutputPath # Path where nuget packages will be copied to.
@@ -54,8 +49,6 @@ stages:
     workspace:
       clean: all # Cleanup the workspace before starting
 
-    container: windows
-
     steps:
     - template: stage-build.yml
       parameters:
@@ -73,7 +66,7 @@ stages:
   - job: Publish_NuGet_External
 
     pool:
-      name: $(windowsPoolName)
+      vmImage: $(windowsHostedAgentImage)
 
     workspace:
       clean: all # Cleanup the workspace before starting

diff --git a/samples/BiometryService.SampleApp.Uno.Mobile/BiometryService.SampleApp.Uno.Mobile.csproj b/samples/BiometryService.SampleApp.Uno.Mobile/BiometryService.SampleApp.Uno.Mobile.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net6.0-android;net6.0-ios</TargetFrameworks>
+		<TargetFrameworks>net7.0-android;net7.0-ios</TargetFrameworks>
 		<SingleProject>true</SingleProject>
 		<OutputType>Exe</OutputType>
 		<IsUnoHead>true</IsUnoHead>
-		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-ios'">14.2</SupportedOSPlatformVersion>
-		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net6.0-android'">21.0</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-ios'">14.2</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="'$(TargetFramework)' == 'net7.0-android'">21.0</SupportedOSPlatformVersion>
 		<DefineConstants>$(DefineConstants);WINUI</DefineConstants>
 	</PropertyGroup>
 
@@ -19,7 +19,7 @@
 	</ItemGroup>
 
 	<Choose>
-		<When Condition="'$(TargetFramework)'=='net6.0-android'">
+		<When Condition="'$(TargetFramework)'=='net7.0-android'">
 			<ItemGroup>
 				<PackageReference Include="Xamarin.Google.Android.Material" Version="1.6.1.1" />
 				<PackageReference Include="Uno.UniversalImageLoader" Version="1.9.36" />
@@ -28,8 +28,8 @@
 				<AndroidEnvironment Include="Android/environment.conf" />
 			</ItemGroup>
 		</When>
-		<When Condition="'$(TargetFramework)'=='net6.0-ios'">
-			<PropertyGroup Condition="'$(TargetFramework)'=='net6.0-ios'">
+		<When Condition="'$(TargetFramework)'=='net7.0-ios'">
+			<PropertyGroup Condition="'$(TargetFramework)'=='net7.0-ios'">
 				<MtouchExtraArgs>$(MtouchExtraArgs) --setenv=MONO_GC_PARAMS=soft-heap-limit=512m,nursery-size=64m,evacuation-threshold=66,major=marksweep,concurrent-sweep</MtouchExtraArgs>
 				<!-- See https://github.com/unoplatform/uno/issues/9430 for more details. -->
 				<MtouchExtraArgs>$(MtouchExtraArgs) --registrar:static</MtouchExtraArgs>

diff --git a/samples/BiometryService.SampleApp.Uno.WinUI/BiometryService.SampleApp.Uno.WinUI.csproj b/samples/BiometryService.SampleApp.Uno.WinUI/BiometryService.SampleApp.Uno.WinUI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
+		<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
 		<TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
 		<RootNamespace>BiometryService.SampleApp.Uno.WinUI</RootNamespace>
 		<ApplicationManifest>app.manifest</ApplicationManifest>

diff --git a/src/BiometryService.Abstractions/BiometryService.Abstractions.csproj b/src/BiometryService.Abstractions/BiometryService.Abstractions.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<LangVersion>10.0</LangVersion>
+		<LangVersion>11.0</LangVersion>
 		<TargetFramework>netstandard2.0</TargetFramework>
 		<RootNamespace>BiometryService</RootNamespace>
 		<Authors>nventive</Authors>

diff --git a/src/BiometryService/BiometryService.csproj b/src/BiometryService/BiometryService.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras/3.0.44">
 	<PropertyGroup>
-		<LangVersion>10.0</LangVersion>
-		<TargetFrameworks>net6.0-android;net6.0-ios;net6.0-windows10.0.19041;xamarinios10;monoandroid12.0;uap10.0.19041;netstandard2.0</TargetFrameworks>
+		<LangVersion>11.0</LangVersion>
+		<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-windows10.0.19041;xamarinios10;monoandroid12.0;uap10.0.19041;netstandard2.0</TargetFrameworks>
 		<RootNamespace>BiometryService</RootNamespace>
 		<Authors>nventive</Authors>
 		<Company>nventive</Company>
@@ -13,7 +13,7 @@
 		<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
 		<PackageProjectUrl>https://github.com/nventive/BiometryService</PackageProjectUrl>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
-		<DefineConstants Condition="'$(TargetFramework)'=='net6.0-windows10.0.19041'">$(DefineConstants);__WINDOWS__</DefineConstants>
+		<DefineConstants Condition="'$(TargetFramework)'=='net7.0-windows10.0.19041'">$(DefineConstants);__WINDOWS__</DefineConstants>
 	</PropertyGroup>
 
 	<!-- Needed for Source Link support. -->
@@ -33,13 +33,13 @@
 		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="5.0.0" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)'=='net6.0-windows10.0.18362'">
+	<ItemGroup Condition="'$(TargetFramework)'=='net7.0-windows10.0.18362'">
 		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.1.3" />
 		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" RuntimeFrameworkVersion="10.0.22000.24" />
 		<FrameworkReference Update="Microsoft.Windows.SDK.NET.Ref" TargetingPackVersion="10.0.22000.24" />
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)'=='net6.0-android' or '$(TargetFramework)'=='monoandroid12.0'">
+	<ItemGroup Condition="'$(TargetFramework)'=='net7.0-android' or '$(TargetFramework)'=='monoandroid12.0'">
 		<PackageReference Include="Xamarin.AndroidX.Biometric" Version="1.1.0.10" />
 		<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.5.1" />
 		<PackageReference Include="Xamarin.AndroidX.Core" Version="1.9.0" />