Fixed template in Release

NuGet.Config

@@ -4,4 +4,4 @@
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
 	<add key="myget.org" value="https://www.myget.org/F/fsharp-collections-immutable/api/v3/index.json" protocolVersion="3" />
   </packageSources>
-</configuration>
+</configuration>

src/Elmish.Uno.Uwp/Elmish.Uno.Uwp.csproj

@@ -9,7 +9,7 @@
       This is not an issue when libraries are referenced through nuget packages. See https://github.com/unoplatform/uno/issues/446 for more details.
       -->
     </PackageReference>
-    <PackageReference Include="Elmish" Version="3.1.0" />
+    <PackageReference Include="Elmish" Version="[3.0.3, 4)" />
     <PackageReference Include="Uno.Core" Version="2.3.0" />
     <PackageReference Include="FSharp.Core" Version="5.0.*" />
   </ItemGroup>

src/Elmish.Uno/Elmish.Uno.fsproj

@@ -51,7 +51,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Elmish" Version="3.1.0" />
+    <PackageReference Include="Elmish" Version="[3.0.3, 4)" />
     <PackageReference Include="FSharp.Collections.Immutable" Version="2.0.0-*" />
   </ItemGroup>
 

src/Templates/SolutionTemplate/.template.config/template.json

@@ -4,12 +4,12 @@
     "classifications": [ "Web", "Uno Platform", "WebAssembly", "Android", "iOS", "Windows", "macOS" ],
     "name": "Elmish Uno Solution Template",
     "shortName": "elmish-unoapp",
-    "defaultName": "App13",
-    "identity": "Elmish.Uno.ProjectTemplates.Dotnet.App13",
+    "defaultName": "SolutionTemplate",
+    "identity": "Elmish.Uno.ProjectTemplates.Dotnet.SolutionTemplate",
     "tags": {
         "language": "F#",
         "type": "project"
     },
-    "sourceName": "App13",
+    "sourceName": "SolutionTemplate",
     "preferNameDirectory": true
 }

src/Templates/SolutionTemplate/.vsconfig

@@ -1,112 +1,58 @@
 {
   "version": "1.0",
   "components": [
-    "Microsoft.VisualStudio.Component.CoreEditor",
     "Microsoft.VisualStudio.Workload.CoreEditor",
+    "Microsoft.VisualStudio.Workload.NetCrossPlat",
+    "Microsoft.VisualStudio.Workload.NetWeb",
+    "Microsoft.VisualStudio.Workload.ManagedDesktop",
+    "Microsoft.VisualStudio.Workload.Universal",
+    "Microsoft.Component.MSBuild",
+    "Microsoft.Component.NetFX.Native",
+    "Microsoft.ComponentGroup.Blend",
+    "Microsoft.NetCore.Component.Runtime.5.0",
     "Microsoft.NetCore.Component.Runtime.3.1",
-    "Microsoft.NetCore.Component.SDK",
-    "Microsoft.VisualStudio.Component.NuGet",
-    "Microsoft.Net.Component.4.6.1.TargetingPack",
-    "Microsoft.VisualStudio.Component.Roslyn.Compiler",
-    "Microsoft.VisualStudio.Component.Roslyn.LanguageServices",
     "Microsoft.NetCore.Component.DevelopmentTools",
-    "Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions",
-    "Microsoft.VisualStudio.Component.DockerTools",
+    "Microsoft.NetCore.Component.SDK",
     "Microsoft.NetCore.Component.Web",
     "Microsoft.Net.Component.4.8.SDK",
-    "Microsoft.Net.Component.4.7.2.TargetingPack",
+    "Microsoft.Net.Component.4.8.TargetingPack",
+    "Microsoft.Net.ComponentGroup.4.8.DeveloperTools",
     "Microsoft.Net.ComponentGroup.DevelopmentPrerequisites",
-    "Microsoft.VisualStudio.Component.TypeScript.4.0",
-    "Microsoft.VisualStudio.Component.JavaScript.TypeScript",
-    "Microsoft.VisualStudio.Component.JavaScript.Diagnostics",
-    "Microsoft.Component.MSBuild",
-    "Microsoft.VisualStudio.Component.TextTemplating",
-    "Component.Microsoft.VisualStudio.RazorExtension",
-    "Microsoft.VisualStudio.Component.IISExpress",
-    "Microsoft.VisualStudio.Component.SQL.ADAL",
-    "Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime",
-    "Microsoft.VisualStudio.Component.Common.Azure.Tools",
-    "Microsoft.VisualStudio.Component.SQL.CLR",
-    "Microsoft.VisualStudio.Component.MSODBC.SQL",
-    "Microsoft.VisualStudio.Component.MSSQL.CMDLnUtils",
-    "Microsoft.VisualStudio.Component.ManagedDesktop.Core",
-    "Microsoft.Net.Component.4.5.2.TargetingPack",
-    "Microsoft.Net.Component.4.5.TargetingPack",
-    "Microsoft.VisualStudio.Component.SQL.SSDT",
-    "Microsoft.VisualStudio.Component.SQL.DataSources",
-    "Component.Microsoft.Web.LibraryManager",
     "Microsoft.VisualStudio.ComponentGroup.Web",
-    "Microsoft.VisualStudio.Component.Web",
-    "Microsoft.VisualStudio.Component.IntelliCode",
-    "Component.Microsoft.VisualStudio.LiveShare",
     "Microsoft.VisualStudio.ComponentGroup.Web.Client",
-    "Microsoft.Net.Component.4.TargetingPack",
-    "Microsoft.Net.Component.4.5.1.TargetingPack",
-    "Microsoft.Net.Component.4.6.TargetingPack",
-    "Microsoft.Net.ComponentGroup.TargetingPacks.Common",
-    "Component.Microsoft.VisualStudio.Web.AzureFunctions",
-    "Microsoft.VisualStudio.ComponentGroup.AzureFunctions",
-    "Microsoft.VisualStudio.Component.Azure.Compute.Emulator",
-    "Microsoft.VisualStudio.Component.Azure.Storage.Emulator",
-    "Microsoft.VisualStudio.Component.Azure.ClientLibs",
-    "Microsoft.VisualStudio.Component.Azure.AuthoringTools",
-    "Microsoft.VisualStudio.Component.CloudExplorer",
-    "Microsoft.VisualStudio.ComponentGroup.Web.CloudTools",
-    "Microsoft.VisualStudio.Component.DiagnosticTools",
-    "Microsoft.VisualStudio.Component.EntityFramework",
-    "Microsoft.VisualStudio.Component.AspNet45",
+    "Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions",
     "Microsoft.VisualStudio.Component.AppInsights.Tools",
+    "Microsoft.VisualStudio.Component.CoreEditor",
+    "Microsoft.VisualStudio.Component.Debugger.JustInTime",
+    "Microsoft.VisualStudio.Component.DiagnosticTools",
+    "Microsoft.VisualStudio.Component.FSharp",
+    "Microsoft.VisualStudio.Component.Graphics",
+    "Microsoft.VisualStudio.Component.IISExpress",
+    "Microsoft.VisualStudio.Component.IntelliCode",
+    "Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd",
+    "Microsoft.VisualStudio.Component.JavaScript.Diagnostics",
+    "Microsoft.VisualStudio.Component.LiveUnitTesting",
+    "Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites",
+    "Microsoft.VisualStudio.Component.ManagedDesktop.Core",
+    "Microsoft.VisualStudio.Component.Roslyn.Compiler",
+    "Microsoft.VisualStudio.Component.Roslyn.LanguageServices",
+    "Microsoft.VisualStudio.Component.NuGet",
+    "Microsoft.VisualStudio.Component.TextTemplating",
+    "Microsoft.VisualStudio.Component.Web",
     "Microsoft.VisualStudio.Component.WebDeploy",
-    "Microsoft.VisualStudio.Component.Wcf.Tooling",
-    "Microsoft.Net.Component.4.6.2.TargetingPack",
-    "Microsoft.Net.Component.4.7.TargetingPack",
-    "Microsoft.Net.Component.4.7.1.TargetingPack",
-    "Microsoft.VisualStudio.Workload.NetWeb",
-    "Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites",
-    "Microsoft.VisualStudio.Component.Azure.Waverton.BuildTools",
-    "Microsoft.VisualStudio.Component.Azure.Waverton",
-    "Microsoft.Component.Azure.DataLake.Tools",
-    "Microsoft.VisualStudio.Component.Azure.Kubernetes.Tools",
-    "Microsoft.VisualStudio.Component.Azure.ResourceManager.Tools",
-    "Microsoft.VisualStudio.ComponentGroup.Azure.ResourceManager.Tools",
-    "Microsoft.VisualStudio.ComponentGroup.Azure.CloudServices",
-    "Microsoft.VisualStudio.Component.Azure.ServiceFabric.Tools",
-    "Microsoft.VisualStudio.Workload.Azure",
-    "Microsoft.VisualStudio.Component.VC.CoreIde",
-    "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
-    "Microsoft.VisualStudio.Component.Graphics.Tools",
     "Microsoft.VisualStudio.Component.Windows10SDK.19041",
-    "Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites",
-    "Microsoft.ComponentGroup.Blend",
-    "Microsoft.VisualStudio.Component.Debugger.JustInTime",
-    "Microsoft.VisualStudio.Component.PortableLibrary",
-    "Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging",
-    "Microsoft.VisualStudio.Workload.ManagedDesktop",
     "Microsoft.VisualStudio.Component.Windows10SDK.18362",
-    "Microsoft.VisualStudio.Component.Windows10SDK.17763",
-    "Microsoft.Component.NetFX.Native",
+    "Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging",
+    "Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine",
     "Microsoft.VisualStudio.ComponentGroup.UWP.NetCoreAndStandard",
-    "Microsoft.VisualStudio.Component.Graphics",
     "Microsoft.VisualStudio.ComponentGroup.UWP.Xamarin",
     "Microsoft.VisualStudio.ComponentGroup.UWP.Support",
-    "Microsoft.VisualStudio.Component.VC.Tools.ARM64",
-    "Microsoft.VisualStudio.Component.UWP.VC.ARM64",
-    "Microsoft.VisualStudio.Component.VC.Tools.ARM",
-    "Microsoft.VisualStudio.ComponentGroup.UWP.VC",
-    "Microsoft.VisualStudio.Workload.Universal",
-    "Component.OpenJDK",
     "Microsoft.VisualStudio.Component.MonoDebugger",
     "Microsoft.VisualStudio.Component.Merq",
-    "Component.Xamarin.RemotedSimulator",
-    "Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine",
+    "Component.Microsoft.Web.LibraryManager",
+    "Component.OpenJDK",
     "Component.Xamarin",
-    "Component.Android.SDK28",
-    "Microsoft.VisualStudio.Workload.NetCrossPlat",
-    "Microsoft.VisualStudio.Workload.NetCoreTools",
-    "Microsoft.Net.Component.4.6.1.SDK",
-    "Microsoft.Net.Component.4.6.2.SDK",
-    "Microsoft.Net.Component.4.7.SDK",
-    "Microsoft.Net.Component.4.7.1.SDK",
-    "Microsoft.Net.Component.4.7.2.SDK"
+    "Component.Xamarin.RemotedSimulator",
+    "Component.Android.SDK30",
   ]
 }

src/Templates/SolutionTemplate/SolutionTemplate/SolutionTemplate.Droid/Properties/AssemblyInfo.cs → src/Templates/SolutionTemplate/SolutionTemplate.Droid/Properties/AssemblyInfo.cs

@@ -2,12 +2,14 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using Android.App;
+using SolutionTemplate;
 
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("SolutionTemplate.Droid")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyTitle(AssemblyInfo.Product + " Droid")]
+/// TODO: Modify description per platform
+[assembly: AssemblyDescription(AssemblyInfo.Description)]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]

src/Templates/SolutionTemplate/SolutionTemplate.Droid/SolutionTemplate.Droid.csproj

@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Solution.Build.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{7CE16AD1-FE6B-405F-B83C-43A05695399C}</ProjectGuid>
+    <ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>$(AssemblyBaseName)</RootNamespace>
+    <AssemblyName>$(AssemblyBaseName).Droid</AssemblyName>
+    <FileAlignment>512</FileAlignment>
+    <AndroidApplication>true</AndroidApplication>
+    <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
+    <AndroidUseAapt2>true</AndroidUseAapt2>
+    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
+    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
+    <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
+    <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
+    <AndroidUseIntermediateDesignerFile>True</AndroidUseIntermediateDesignerFile>
+    <ResourcesDirectory>..\SolutionTemplate.Shared\Strings</ResourcesDirectory>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>portable</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
+    <AndroidLinkMode>None</AndroidLinkMode>
+    <AndroidSupportedAbis>armeabi-v7a;arm64-v8a;x86;x86_64</AndroidSupportedAbis>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>portable</DebugType>
+    <DebugSymbols>true</DebugSymbols>
+    <AndroidManagedSymbols>true</AndroidManagedSymbols>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
+    <AndroidLinkMode>None</AndroidLinkMode>
+    <AndroidCreatePackagePerAbi>true</AndroidCreatePackagePerAbi>
+    <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
+    <AotAssemblies>true</AotAssemblies>
+    <EnableLLVM>true</EnableLLVM>
+    <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
+    <AndroidSupportedAbis>armeabi-v7a;arm64-v8a;x86;x86_64</AndroidSupportedAbis>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Mono.Android" />
+    <Reference Include="Mono.Android.Export" />
+    <Reference Include="mscorlib" />
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="DisposableFixer" Version="3.3.0" />
+    <PackageReference Include="Elmish.Uno" Version="1.0.0-ci-*" />
+    <PackageReference Include="Elmish" Version="3.1.0" />
+    <PackageReference Include="FSharp.Core" Version="5.0.*" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
+    <PackageReference Include="Uno.Microsoft.Toolkit" Version="7.0.*" />
+    <PackageReference Include="Uno.Microsoft.Toolkit.Uwp" Version="7.0.*" />
+    <PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI" Version="7.0.*" />
+    <PackageReference Include="Uno.Microsoft.Toolkit.Uwp.UI.Controls" Version="7.0.*" />
+    <PackageReference Include="Uno.UI.RemoteControl" Version="3.7.4" Condition="'$(Configuration)'=='Debug'" />
+    <PackageReference Include="Uno.UI" Version="3.7.4" />
+    <PackageReference Include="Uno.UniversalImageLoader" Version="1.9.33" />
+    <!--  Analyzers   -->
+    <PackageReference Include="Roslynator.Analyzers" Version="3.1.0" PrivateAssets="all">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.*" PrivateAssets="all">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="ErrorProne.NET.Structs" Version="0.1.2" PrivateAssets="all">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="ErrorProne.NET.CoreAnalyzers" Version="0.1.2" PrivateAssets="all">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="MainActivity.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Main.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidAsset Include="Assets\Fonts\uno-fluentui-assets.ttf" />
+    <None Include="Resources\AboutResources.txt" />
+    <None Include="Assets\AboutAssets.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\values\Strings.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\drawable\Icon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\values\Styles.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Properties\AndroidManifest.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\SolutionTemplate\SolutionTemplate.fsproj">
+      <Project>{5b45bd3e-38ef-4dc1-8f6a-e421cbcba46b}</Project>
+      <Name>SolutionTemplate</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="..\SolutionTemplate.Shared\SolutionTemplate.Shared.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
+  <!-- This will force the generation of the APK when not building inside visual studio -->
+  <Target Name="GenerateBuild" DependsOnTargets="SignAndroidPackage" AfterTargets="Build" Condition="'$(BuildingInsideVisualStudio)'==''" />
+  <Target Name="Issue3897Workaround" Condition=" '$(ManagedDesignTimeBuild)' == 'True' " AfterTargets="_RemoveLegacyDesigner">
+    <!-- See https://github.com/unoplatform/uno/issues/3897 and https://github.com/xamarin/xamarin-android/issues/5069 for more details -->
+    <ItemGroup>
+      <Compile Remove="$(_AndroidResourceDesignerFile)" />
+    </ItemGroup>
+  </Target>
+</Project>

src/Templates/SolutionTemplate/SolutionTemplate/SolutionTemplate.Shared/App.xaml.cs → src/Templates/SolutionTemplate/SolutionTemplate.Shared/App.xaml.cs

@@ -180,11 +180,11 @@ private static void InitializeLogging()
         {
             var factory = LoggerFactory.Create(builder =>
             {
-//-:cnd:noEmit
+                //-:cnd:noEmit
 #if __WASM__
-#pragma warning disable DF0000 // Marks undisposed anonymous objects from object creations.
+#pragma warning disable DF0000 // Marks indisposed anonymous objects from object creations.
                 builder.AddProvider(new global::Uno.Extensions.Logging.WebAssembly.WebAssemblyConsoleLoggerProvider());
-#pragma warning restore DF0000 // Marks undisposed anonymous objects from object creations.
+#pragma warning restore DF0000 // Marks indisposed anonymous objects from object creations.
 #elif __IOS__
                 builder.AddProvider(new global::Uno.Extensions.Logging.OSLogLoggerProvider());
 #elif NETFX_CORE

src/Templates/SolutionTemplate/SolutionTemplate/SolutionTemplate.Shared/Controls/ValidationControl.cs → src/Templates/SolutionTemplate/SolutionTemplate.Shared/Controls/ValidationControl.cs

@@ -113,13 +113,11 @@ public Style ErrorContentStyle
         /// <summary>
         /// Provides derived classes an opportunity to handle changes to the ErrorContentStyle property.
         /// </summary>
-#pragma warning disable CS0628 // New protected member declared in sealed type
 #pragma warning disable CA1801 // Review unused parameters
 #pragma warning disable RCS1163 // Unused parameter.
-        protected void OnErrorContentStyleChanged(Style oldErrorContentStyle, Style newErrorContentStyle)
+        private void OnErrorContentStyleChanged(Style oldErrorContentStyle, Style newErrorContentStyle)
 #pragma warning restore RCS1163 // Unused parameter.
 #pragma warning restore CA1801 // Review unused parameters
-#pragma warning restore CS0628 // New protected member declared in sealed type
          => TrySetStyle();
 
         #endregion

src/Templates/SolutionTemplate/SolutionTemplate/SolutionTemplate.Shared/SolutionTemplate.Shared.shproj → src/Templates/SolutionTemplate/SolutionTemplate.Shared/SolutionTemplate.Shared.shproj

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Globals">
-	<ProjectGuid>6279c845-92f8-4333-ab99-3d213163593c</ProjectGuid>
-	<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  <ProjectGuid>6279c845-92f8-4333-ab99-3d213163593c</ProjectGuid>
+  <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />

src/Templates/SolutionTemplate/SolutionTemplate/SolutionTemplate.Wasm/GlobalSuppressions.cs → src/Templates/SolutionTemplate/SolutionTemplate.Skia.Gtk/GlobalSuppressions.cs

@@ -1,8 +1,8 @@
-// This file is used by Code Analysis to maintain SuppressMessage
+// This file is used by Code Analysis to maintain SuppressMessage
 // attributes that are applied to this project.
 // Project-level suppressions either have no target or are given
 // a specific target and scoped to a namespace, type, member, etc.
 
 using System.Diagnostics.CodeAnalysis;
 
-[assembly: SuppressMessage("Wrong Usage", "DF0033:Marks undisposed objects assinged to a property, originated from a method invocation.", Justification = "<Pending>")]
+[assembly: SuppressMessage("Wrong Usage", "DF0033:Marks undisposed objects assinged to a property, originated from a method invocation.", Justification = "Disabled for WASM here because .editorconfig rule does not work")]