Set C# and F# language versions and FSharp.Core version via variables

xperiandri · xperiandri · Jan 30, 2021 · Feb 21, 2021 · May 16, 2021 · May 16, 2021
commit eeb10bd00772012d5d56b9da8b9c511834e8012b
diff --git a/src/Samples/Samples.Droid/Samples.Droid.csproj b/src/Samples/Samples.Droid/Samples.Droid.csproj
@@ -4,6 +4,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <LangVersion>$(CSharpLangVersion)</LangVersion>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{3DE4429B-5BB1-423F-B529-8AD31E841DB3}</ProjectGuid>

diff --git a/src/Samples/Samples.Skia.Gtk/Samples.Skia.Gtk.csproj b/src/Samples/Samples.Skia.Gtk/Samples.Skia.Gtk.csproj
@@ -36,4 +36,4 @@
     <ProjectReference Include="..\Samples\Samples.fsproj" />
   </ItemGroup>
   <Import Project="..\Samples.Shared\Samples.Shared.projitems" Label="Shared" />
-</Project>
+</Project>
diff --git a/src/Samples/Samples.Skia.Tizen/Samples.Skia.Tizen.csproj b/src/Samples/Samples.Skia.Tizen/Samples.Skia.Tizen.csproj
@@ -4,6 +4,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>tizen50</TargetFramework>
+    <LangVersion>$(CSharpLangVersion)</LangVersion>
     <OutputType>Exe</OutputType>
     <DefineConstants>$(DefineConstants);__TIZEN__;</DefineConstants>
     <AssemblyName>$(AssemblyBaseName)</AssemblyName>
@@ -41,4 +42,4 @@
     <ProjectReference Include="..\Samples\Samples.fsproj" />
   </ItemGroup>
   <Import Project="..\Samples.Shared\Samples.Shared.projitems" Label="Shared" />
-</Project>
+</Project>
diff --git a/src/Samples/Samples.Skia.Wpf.Host/Samples.Skia.Wpf.Host.csproj b/src/Samples/Samples.Skia.Wpf.Host/Samples.Skia.Wpf.Host.csproj
@@ -5,6 +5,7 @@
     <OutputType Condition="'$(Configuration)'=='Release'">WinExe</OutputType>
     <OutputType Condition="'$(Configuration)'=='Debug'">Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+    <LangVersion>$(CSharpLangVersion)</LangVersion>
     <UseWPF>true</UseWPF>
     <AssemblyName>$(AssemblyBaseName).Host</AssemblyName>
   </PropertyGroup>
@@ -30,4 +31,4 @@
     <ProjectReference Include="..\Samples.Skia.WPF\Samples.Skia.WPF.csproj" />
     <ProjectReference Include="..\Samples\Samples.fsproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/Samples/Samples.Skia.Wpf/Samples.Skia.Wpf.csproj b/src/Samples/Samples.Skia.Wpf/Samples.Skia.Wpf.csproj
@@ -3,6 +3,7 @@
   <Import Project="..\Samples.Build.props" />
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>$(CSharpLangVersion)</LangVersion>
     <AssemblyName>$(AssemblyBaseName)</AssemblyName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
@@ -29,4 +30,4 @@
     <ProjectReference Include="..\Samples\Samples.fsproj" />
   </ItemGroup>
   <Import Project="..\Samples.Shared\Samples.Shared.projitems" Label="Shared" />
-</Project>
+</Project>
diff --git a/src/Samples/Samples.UWP/Samples.UWP.csproj b/src/Samples/Samples.UWP/Samples.UWP.csproj
@@ -2,17 +2,14 @@
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <Import Project="..\Samples.Build.props" />
-  <PropertyGroup>
-    <LangVersion>9.0</LangVersion>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-  </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.11">
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
       <!--
       If, in the same solution, you are referencing a project that uses https://github.com/onovotny/MSBuildSdkExtras,
       you need to make sure that the version provided here matches https://github.com/novotnyllc/MSBuildSdkExtras/blob/main/Source/MSBuild.Sdk.Extras/DefaultItems/ImplicitPackages.targets#L11.
       This is not an issue when libraries are referenced through nuget packages. See https://github.com/unoplatform/uno/issues/446 for more details.
       -->
+      <Version>6.2.13</Version>
     </PackageReference>
     <PackageReference Include="Elmish" Version="$(ElmishVersion)" />
     <PackageReference Include="FSharp.Core" Version="$(FSharpCoreVersion)" />
@@ -27,12 +24,14 @@
     <PackageReference Include="Uno.UI" Version="$(UnoUIVersion)" />
   </ItemGroup>
   <PropertyGroup>
+    <LangVersion>$(CSharpLangVersion)</LangVersion>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     <ProjectGuid>{E025D4A5-F4D9-44CF-80DF-B81A9EE5DB0E}</ProjectGuid>
     <OutputType>AppContainerExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <AssemblyName>$(AssemblyBaseName)</AssemblyName>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
     <TargetPlatformVersion>10.0.18362.0</TargetPlatformVersion>

diff --git a/src/Samples/Samples.Wasm/Samples.Wasm.csproj b/src/Samples/Samples.Wasm/Samples.Wasm.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>$(CSharpLangVersion)</LangVersion>
     <NoWarn>NU1701</NoWarn>
     <AssemblyName>$(AssemblyBaseName)</AssemblyName>
   </PropertyGroup>
@@ -67,4 +67,4 @@
     <ProjectReference Include="..\Samples\Samples.fsproj" />
   </ItemGroup>
   <Import Project="..\Samples.Shared\Samples.Shared.projitems" Label="Shared" Condition="Exists('..\Samples.Shared\Samples.Shared.projitems')" />
-</Project>
+</Project>
diff --git a/src/Samples/Samples.iOS/Samples.iOS.csproj b/src/Samples/Samples.iOS/Samples.iOS.csproj
@@ -2,6 +2,7 @@
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\Samples.Build.props" />
   <PropertyGroup>
+    <LangVersion>$(CSharpLangVersion)</LangVersion>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
     <ProjectGuid>{67476367-BB0B-4A84-B8BB-7ED4ED2F1CD6}</ProjectGuid>

diff --git a/src/Samples/Samples.macOS/Samples.macOS.csproj b/src/Samples/Samples.macOS/Samples.macOS.csproj
@@ -2,6 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\Samples.Build.props" />
   <PropertyGroup>
+    <LangVersion>$(CSharpLangVersion)</LangVersion>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
     <ProjectGuid>{39D21008-549B-42ED-8640-3B9AAEFB2921}</ProjectGuid>

diff --git a/src/Templates/SolutionTemplate/Solution.Build.props b/src/Templates/SolutionTemplate/Solution.Build.props
@@ -6,6 +6,9 @@
     <Product>SolutionTemplate</Product>
     <Authors>Elmish.Unp</Authors>
     <Copyright>Copyright © XperiAndri</Copyright>
+    <CSharpLangVersion>10.0</CSharpLangVersion>
+    <FSharpLangVersion>6.0</FSharpLangVersion>
+    <FSharpCoreVersion>6.0.*</FSharpCoreVersion>
     <MicrosoftExtensionsVersion>5.0.*</MicrosoftExtensionsVersion>
     <ToolkitVersion>7.0.*</ToolkitVersion>
     <UnoUIVersion>[3.10.*,4.0.0)</UnoUIVersion>

diff --git a/...Templates/SolutionTemplate/SolutionTemplate.Skia.Tizen/SolutionTemplate.Skia.Tizen.csproj b/...Templates/SolutionTemplate/SolutionTemplate.Skia.Tizen/SolutionTemplate.Skia.Tizen.csproj
@@ -3,9 +3,9 @@
   <Import Project="..\Solution.Build.props" />
   <Import Project="..\Analyzers.Build.props" />
   <PropertyGroup>
-    <LangVersion>9.0</LangVersion>
     <OutputType>Exe</OutputType>
     <TargetFramework>tizen50</TargetFramework>
+    <LangVersion>$(CSharpLangVersion)</LangVersion>
     <OutputType>Exe</OutputType>
     <DefineConstants>$(DefineConstants);__TIZEN__;</DefineConstants>
     <AssemblyName>$(AssemblyBaseName)</AssemblyName>

diff --git a/src/Templates/SolutionTemplate/SolutionTemplate.Skia.Wpf/SolutionTemplate.Skia.Wpf.csproj b/src/Templates/SolutionTemplate/SolutionTemplate.Skia.Wpf/SolutionTemplate.Skia.Wpf.csproj
@@ -3,8 +3,8 @@
   <Import Project="..\Solution.Build.props" />
   <Import Project="..\Analyzers.Build.props" />
   <PropertyGroup>
-    <LangVersion>9.0</LangVersion>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>$(CSharpLangVersion)</LangVersion>
     <AssemblyName>$(AssemblyBaseName)</AssemblyName>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>

diff --git a/src/Templates/SolutionTemplate/SolutionTemplate.UWP/SolutionTemplate.UWP.csproj b/src/Templates/SolutionTemplate/SolutionTemplate.UWP/SolutionTemplate.UWP.csproj
@@ -10,7 +10,7 @@
       you need to make sure that the version provided here matches https://github.com/novotnyllc/MSBuildSdkExtras/blob/main/Source/MSBuild.Sdk.Extras/DefaultItems/ImplicitPackages.targets#L11.
       This is not an issue when libraries are referenced through nuget packages. See https://github.com/unoplatform/uno/issues/446 for more details.
       -->
-      <Version>6.2.11</Version>
+      <Version>6.2.13</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="$(MicrosoftExtensionsVersion)" />
@@ -22,7 +22,7 @@
     <PackageReference Include="Uno.UI" Version="$(UnoUIVersion)" />
   </ItemGroup>
   <PropertyGroup>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>$(CSharpLangVersion)</LangVersion>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     <ProjectGuid>{7727D8AD-8883-427D-A77A-7C8639ACE4AF}</ProjectGuid>

diff --git a/src/Templates/SolutionTemplate/SolutionTemplate.Wasm/SolutionTemplate.Wasm.csproj b/src/Templates/SolutionTemplate/SolutionTemplate.Wasm/SolutionTemplate.Wasm.csproj
@@ -5,6 +5,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net5.0</TargetFramework>
+    <LangVersion>$(CSharpLangVersion)</LangVersion>
     <!-- .editorcofig bases suppressions do not work in WASM for some unknown reasons -->
     <NoWarn>NU1701;DF0033</NoWarn>
     <AssemblyName>$(AssemblyBaseName)</AssemblyName>

diff --git a/src/Templates/SolutionTemplate/SolutionTemplate.iOS/SolutionTemplate.iOS.csproj b/src/Templates/SolutionTemplate/SolutionTemplate.iOS/SolutionTemplate.iOS.csproj
@@ -3,7 +3,7 @@
   <Import Project="..\Solution.Build.props" />
   <Import Project="..\Analyzers.Build.props" />
   <PropertyGroup>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>$(CSharpLangVersion)</LangVersion>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
     <ProjectGuid>{C306819D-C046-4130-B9EF-68546B2CFBA4}</ProjectGuid>

diff --git a/src/Templates/SolutionTemplate/SolutionTemplate.macOS/SolutionTemplate.macOS.csproj b/src/Templates/SolutionTemplate/SolutionTemplate.macOS/SolutionTemplate.macOS.csproj
@@ -2,11 +2,11 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\Solution.Build.props" />
   <PropertyGroup>
+    <LangVersion>$(CSharpLangVersion)</LangVersion>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
     <ProjectGuid>{4E726E84-2EA2-49D0-9B55-2D30FD5A892C}</ProjectGuid>
     <ProjectTypeGuids>{A3F8F2AB-B479-4A4A-A458-A89E7DC349F1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <LangVersion>9.0</LangVersion>
     <TargetFrameworkIdentifier>Xamarin.Mac</TargetFrameworkIdentifier>
     <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <OutputType>Exe</OutputType>

diff --git a/src/Templates/SolutionTemplate/SolutionTemplate/SolutionTemplate.fsproj b/src/Templates/SolutionTemplate/SolutionTemplate/SolutionTemplate.fsproj
@@ -3,6 +3,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <LangVersion>$(FSharpLangVersion)</LangVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>$(AssemblyBaseName).Programs</AssemblyName>
   </PropertyGroup>
@@ -37,6 +38,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="6.0.*" />
+    <PackageReference Update="FSharp.Core" Version="$(FSharpCoreVersion)" />
   </ItemGroup>
 </Project>