Merge pull request #412 from unoplatform/dev/jela/53-update

chore: Move to uno 5.3
unoplatform · Jul 22, 2024 · 5f88aea · 5f88aea
2 parents 71cc68f + 60efdb6
commit 5f88aea
Show file tree

Hide file tree

Showing 176 changed files with 599 additions and 3,054 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -18,20 +18,20 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 7.0.102
+        dotnet-version: 8.0.300
 
     - name: Install .NET Workloads
       shell: pwsh
       run: |
-        & dotnet tool install --global --version 1.16.1 uno.check
-        & ~/.dotnet/tools/uno-check --ci --fix --non-interactive --verbose
+        & dotnet tool install --global --version 1.25.1 uno.check
+        & ~/.dotnet/tools/uno-check --ci --fix --skip androidsdk --skip openjdk --non-interactive --verbose
 
     - name: Build
       run: |
         mkdir -p $GITHUB_WORKSPACE/artifacts
         mkdir -p $GITHUB_WORKSPACE/artifacts/wasm
-        cd src/MyApp.Wasm
-        dotnet publish -c Release -f net7.0 -p:OverrideTargetFrameworks=net7.0 /bl:/artifacts/mbuild.binlog -o $GITHUB_WORKSPACE/artifacts/wasm
+        cd src/MyApp
+        dotnet publish -c Release -f net8.0-browserwasm -p:OverrideTargetFrameworks=net8.0 /bl:/artifacts/mbuild.binlog -o $GITHUB_WORKSPACE/artifacts/wasm
 
     - uses: actions/upload-artifact@v2
       with:

diff --git a/src/.editorconfig b/src/.editorconfig
@@ -153,7 +153,7 @@ csharp_indent_labels = one_less_than_current
 csharp_using_directive_placement = outside_namespace:silent
 csharp_prefer_simple_using_statement = true:suggestion
 csharp_prefer_braces = true:silent
-csharp_style_namespace_declarations = block_scoped:silent
+csharp_style_namespace_declarations = file_scoped:warning
 csharp_style_prefer_method_group_conversion = true:silent
 csharp_style_prefer_top_level_statements = true:silent
 csharp_style_prefer_primary_constructors = true:suggestion

diff --git a/src/.gitignore b/src/.gitignore
@@ -399,5 +399,5 @@ FodyWeavers.xsd
 
 # Single Target Config
 solution-config.props
-# Windows Publish Profiles
-!**/*.Windows/Properties/PublishProfiles/*.pubxml
+# Publish Profiles
+!**/Properties/PublishProfiles/*.pubxml
diff --git a/src/.run/MyApp.run.xml b/src/.run/MyApp.run.xml
@@ -0,0 +1,62 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="MyApp (Desktop)" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
+    <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/MyApp/MyApp.csproj" />
+    <option name="LAUNCH_PROFILE_TFM" value="net8.0-desktop" />
+    <option name="LAUNCH_PROFILE_NAME" value="MyApp (Desktop)" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
+    <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
+    <option name="SEND_DEBUG_REQUEST" value="1" />
+    <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
+  <configuration default="false" name="MyApp (WebAssembly IIS Express)" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
+    <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/MyApp/MyApp.csproj" />
+    <option name="LAUNCH_PROFILE_TFM" value="net8.0-browserwasm" />
+    <option name="LAUNCH_PROFILE_NAME" value="MyApp (WebAssembly IIS Express)" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
+    <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
+    <option name="SEND_DEBUG_REQUEST" value="1" />
+    <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
+  <configuration default="false" name="MyApp (WebAssembly)" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
+    <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/MyApp/MyApp.csproj" />
+    <option name="LAUNCH_PROFILE_TFM" value="net8.0-browserwasm" />
+    <option name="LAUNCH_PROFILE_NAME" value="MyApp (WebAssembly)" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
+    <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
+    <option name="SEND_DEBUG_REQUEST" value="1" />
+    <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
+  <configuration default="false" name="MyApp (WinAppSDK Unpackaged)" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
+    <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/MyApp/MyApp.csproj" />
+    <option name="LAUNCH_PROFILE_TFM" value="net8.0-windows10.0.19041.0" />
+    <option name="LAUNCH_PROFILE_NAME" value="MyApp (WinAppSDK Unpackaged)" />
+    <option name="USE_EXTERNAL_CONSOLE" value="0" />
+    <option name="USE_MONO" value="0" />
+    <option name="RUNTIME_ARGUMENTS" value="" />
+    <option name="GENERATE_APPLICATIONHOST_CONFIG" value="1" />
+    <option name="SHOW_IIS_EXPRESS_OUTPUT" value="0" />
+    <option name="SEND_DEBUG_REQUEST" value="1" />
+    <option name="ADDITIONAL_IIS_EXPRESS_ARGUMENTS" value="" />
+    <method v="2">
+      <option name="Build" />
+    </method>
+  </configuration>
+</component>
diff --git a/src/.run/Readme.md b/src/.run/Readme.md
@@ -0,0 +1,3 @@
+# About the `.run` folder
+
+This folder is present to add support for the [Rider IDE](https://aka.platform.uno/rider-getstarted). You can remove this folder safely if you're not using Rider.
diff --git a/src/.vscode/launch.json b/src/.vscode/launch.json
diff --git a/src/.vscode/settings.json b/src/.vscode/settings.json
diff --git a/src/.vscode/tasks.json b/src/.vscode/tasks.json
diff --git a/src/.vsconfig b/src/.vsconfig
@@ -15,25 +15,20 @@
     "Microsoft.VisualStudio.Component.Web",
     "Microsoft.VisualStudio.ComponentGroup.Web.Client",
     "Microsoft.VisualStudio.Workload.NetWeb",
-    "Microsoft.VisualStudio.ComponentGroup.Azure.Prerequisites",
-    "Microsoft.VisualStudio.Workload.Azure",
     "Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.TemplateEngine",
-    "Microsoft.VisualStudio.Component.Windows10SDK.19041",
     "Microsoft.VisualStudio.ComponentGroup.MSIX.Packaging",
     "Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites",
     "Microsoft.VisualStudio.Component.Debugger.JustInTime",
     "Microsoft.VisualStudio.Workload.ManagedDesktop",
-    "Microsoft.Component.NetFX.Native",
-    "Microsoft.VisualStudio.Component.Graphics",
-    "Microsoft.VisualStudio.Component.Merq",
     "Component.Xamarin.RemotedSimulator",
     "Microsoft.VisualStudio.Component.MonoDebugger",
-    "Component.Xamarin",
     "Microsoft.VisualStudio.ComponentGroup.Maui.All",
     "Component.Android.SDK34",
-    "Component.Android.SDK33",
     "Component.OpenJDK",
     "Microsoft.VisualStudio.Workload.NetCrossPlat",
     "Microsoft.VisualStudio.Workload.NetCoreTools"
+  ],
+  "extensions": [
+    "https://marketplace.visualstudio.com/items?itemName=unoplatform.uno-platform-addin-2022"
   ]
 }
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,21 +1,7 @@
-<Project>
-
-  <!--
-    If working on a single target framework, open solution-config.props and uncomment the 
-    appropriate lines in solution-config.props to build for the desired platforms only.
-
-    https://platform.uno/docs/articles/guides/solution-building-single-targetframework.html
-  -->
-  <Import Project="solution-config.props" Condition="exists('solution-config.props')" />
-
-
+<Project>
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-
-    <DebugType>portable</DebugType>
-    <DebugSymbols>True</DebugSymbols>
-
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
 
     <!--
@@ -25,53 +11,5 @@
       PRI257: Ignore default language (en) not being one of the included resources (eg en-us, en-uk)
     -->
     <NoWarn>$(NoWarn);NU1507;NETSDK1201;PRI257</NoWarn>
-
-    <DefaultLanguage>en</DefaultLanguage>
-
-    <IsAndroid>false</IsAndroid>
-    <IsIOS>false</IsIOS>
-    <IsMac>false</IsMac>
-    <IsMacCatalyst>false</IsMacCatalyst>
-    <IsWinAppSdk>false</IsWinAppSdk>
-
-    <!-- Required for Hot Reload (See https://github.com/unoplatform/uno.templates/issues/376) -->
-    <GenerateAssemblyInfo Condition="'$(Configuration)'=='Debug'">false</GenerateAssemblyInfo>
   </PropertyGroup>
-
-  <Choose>
-    <When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">
-      <PropertyGroup>
-        <IsAndroid>true</IsAndroid>
-        <SupportedOSPlatformVersion>21.0</SupportedOSPlatformVersion>
-      </PropertyGroup>
-    </When>
-    <When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">
-      <PropertyGroup>
-        <IsIOS>true</IsIOS>
-        <SupportedOSPlatformVersion>14.2</SupportedOSPlatformVersion>
-      </PropertyGroup>
-    </When>
-    <When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'macos'">
-      <PropertyGroup>
-        <IsMac>true</IsMac>
-        <SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
-      </PropertyGroup>
-    </When>
-    <When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
-      <PropertyGroup>
-        <IsMacCatalyst>true</IsMacCatalyst>
-        <SupportedOSPlatformVersion>14.0</SupportedOSPlatformVersion>
-      </PropertyGroup>
-    </When>
-    <When Condition="$(TargetFramework.Contains('windows10'))">
-      <PropertyGroup>
-        <IsWinAppSdk>true</IsWinAppSdk>
-        <SupportedOSPlatformVersion>10.0.18362.0</SupportedOSPlatformVersion>
-        <TargetPlatformMinVersion>10.0.18362.0</TargetPlatformMinVersion>
-        <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
-        <EnableCoreMrtTooling Condition=" '$(BuildingInsideVisualStudio)' != 'true' ">false</EnableCoreMrtTooling>
-      </PropertyGroup>
-    </When>
-  </Choose>
-
 </Project>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -1,6 +1,2 @@
 <Project>
-  <ItemGroup>
-    <!-- Removes native usings to avoid Ambiguous reference -->
-    <Using Remove="@(Using->HasMetadata('Platform'))" />
-  </ItemGroup>
 </Project>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -1,27 +1,10 @@
-<Project ToolsVersion="15.0">
+<Project ToolsVersion="15.0">
+  <!--
+    To update the version of Uno, you should instead update the Sdk version in the global.json file.
+
+    See https://aka.platform.uno/using-uno-sdk for more information.
+    See https://aka.platform.uno/using-uno-sdk#implicit-packages for more information regarding the Implicit Packages.
+  -->
   <ItemGroup>
-    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Windows.Compatibility" Version="7.0.5" />
-    <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.4.231008000" />
-    <PackageVersion Include="SkiaSharp.Skottie" Version="2.88.6" />
-    <PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.6" />
-    <PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.0.1" />
-    <PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
-    <PackageVersion Include="Uno.Extensions.Logging.WebAssembly.Console" Version="1.7.0" />
-    <PackageVersion Include="Uno.Resizetizer" Version="1.2.0" />
-    <PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.0.19" />
-    <PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.36" />
-    <PackageVersion Include="Uno.Wasm.Bootstrap" Version="7.0.31" />
-    <PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="7.0.31" />
-    <PackageVersion Include="Uno.Wasm.Bootstrap.Server" Version="7.0.31" />
-    <PackageVersion Include="Uno.WinUI" Version="5.0.19" />
-    <PackageVersion Include="Uno.WinUI.Lottie" Version="5.0.19" />
-    <PackageVersion Include="Uno.WinUI.DevServer" Version="5.0.19" />
-    <PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="5.0.19" />
-    <PackageVersion Include="Uno.WinUI.Skia.Linux.FrameBuffer" Version="5.0.19" />
-    <PackageVersion Include="Uno.WinUI.Skia.Wpf" Version="5.0.19" />
-    <PackageVersion Include="Uno.WinUI.WebAssembly" Version="5.0.19" />
-    <PackageVersion Include="Xamarin.Google.Android.Material" Version="1.10.0.1" />
   </ItemGroup>
 </Project>
diff --git a/src/MyApp.Base/App.xaml b/src/MyApp.Base/App.xaml
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# About the `.run` folder

		This folder is present to add support for the [Rider IDE](https://aka.platform.uno/rider-getstarted). You can remove this folder safely if you're not using Rider.