Merge branch 'main' into pj/fix-android-emulator-at-m1

unoplatform · Mar 10, 2023 · 8237585 · 8237585
2 parents 8731a29 + fbb2725
commit 8237585
Show file tree

Hide file tree

Showing 109 changed files with 9,500 additions and 172 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,6 +12,9 @@ on:
       - main
       - release/**
 
+env:
+  GitVersion_Version: 5.10.3
+
 jobs:
   build_tool:
     name: Build
@@ -40,7 +43,7 @@ jobs:
     - name: Setup GitVersion
       uses: gittools/actions/gitversion/setup@v0.9.9
       with:
-        versionSpec: '5.x'
+        versionSpec: ${{ env.GitVersion_Version }}
 
     - name: GitVersion
       id: gitversion
@@ -72,6 +75,8 @@ jobs:
            manifest_name: Stable
          - manifest: 'manifests\uno.ui-preview.manifest.json'
            manifest_name: Preview
+         - manifest: 'manifests\uno.ui-preview-major.manifest.json'
+           manifest_name: Preview net8
          - manifest: 'manifests\uno.ui.manifest.json'
            manifest_name: Stable Upgrade
            previous_tool_version: 1.4.2
@@ -80,6 +85,10 @@ jobs:
            manifest_name: Preview Upgrade
            previous_tool_version: 1.4.2
            previous_tool_params: '--pre'
+         - manifest: 'manifests\uno.ui-preview-major.manifest.json'
+           manifest_name: Preview Upgrade net8
+           previous_tool_version: 1.4.2
+           previous_tool_params: '--pre'
 
     steps:
       - name: Checkout
@@ -100,7 +109,7 @@ jobs:
       - name: Setup GitVersion
         uses: gittools/actions/gitversion/setup@v0.9.9
         with:
-          versionSpec: '5.x'
+          versionSpec: ${{ env.GitVersion_Version }}
 
       - name: GitVersion
         id: gitversion
@@ -135,39 +144,86 @@ jobs:
 
     strategy:
       matrix:
-       os: [macos-11, macos-12]
        include:
-         # Disabled as of 2022-01-12 because of macOS .NET 6.0.100 installation failure on CI agents:
-         #
-         #   Executing dotnet-install script...
-         #   sh /var/folders/24/8k48jl6d249_n_qfxwsl6xvm0000gn/T/dotnet-install.sh --install-dir /Users/runner/.dotnet --version 6.0.100
-         #   SHELL: /bin/zsh /var/folders/24/8k48jl6d249_n_qfxwsl6xvm0000gn/T/tmpVaukbx.tmp
-         #   dotnet-install: Note that the intended use of this script is for Continuous Integration (CI) scenarios, where:
-         #   dotnet-install: - The SDK needs to be installed without user interaction and without admin rights.
-         #   dotnet-install: - The SDK installation doesn't need to persist across multiple CI runs.
-         #   dotnet-install: To set up a development environment or to run apps, use installers rather than this script. Visit https://dotnet.microsoft.com/download to get the installer.
-         #
-         #   dotnet-install: .NET Core SDK with version '' is already installed.
-         #   Fix applied.  Checking again...
-         #
-         #- manifest: 'manifests/uno.ui.manifest.json'
-         #  manifest_name: Stable
+         - manifest: 'manifests/uno.ui.manifest.json'
+           manifest_name: Stable
+           os: macos-11
+           dotnet_version: 7.0.102
 
          - manifest: 'manifests/uno.ui-preview.manifest.json'
            manifest_name: Preview
            previous_tool_version: ''
            previous_tool_params: ''
+           os: macos-11
+           dotnet_version: 7.0.200-preview.22628.1
+
+         - manifest: 'manifests/uno.ui-preview-major.manifest.json'
+           manifest_name: Preview net8
+           previous_tool_version: ''
+           previous_tool_params: ''
+           os: macos-11
+           dotnet_version: 8.0.100-preview.1.23115.2
 
          - manifest: 'manifests/uno.ui.manifest.json'
            manifest_name: Stable Upgrade
            previous_tool_version: 1.4.2
            previous_tool_params: ''
+           os: macos-11
+           dotnet_version: 7.0.102
 
          - manifest: 'manifests/uno.ui-preview.manifest.json'
            manifest_name: Preview Upgrade
            previous_tool_version: 1.4.2
            previous_tool_params: '--pre'
+           os: macos-11
+           dotnet_version: 7.0.200-preview.22628.1
+
+         - manifest: 'manifests/uno.ui-preview-major.manifest.json'
+           manifest_name: Preview Upgrade net8
+           previous_tool_version: 1.4.2
+           previous_tool_params: '--pre'
+           os: macos-11
+           dotnet_version: 8.0.100-preview.1.23115.2
 
+         - manifest: 'manifests/uno.ui.manifest.json'
+           manifest_name: Stable
+           os: macos-12
+           dotnet_version: 7.0.102
+
+         - manifest: 'manifests/uno.ui-preview.manifest.json'
+           manifest_name: Preview
+           previous_tool_version: ''
+           previous_tool_params: ''
+           os: macos-12
+           dotnet_version: 7.0.200-preview.22628.1
+
+         - manifest: 'manifests/uno.ui-preview-major.manifest.json'
+           manifest_name: Preview net8
+           previous_tool_version: ''
+           previous_tool_params: ''
+           os: macos-12
+           dotnet_version: 8.0.100-preview.1.23115.2
+
+         - manifest: 'manifests/uno.ui.manifest.json'
+           manifest_name: Stable Upgrade
+           previous_tool_version: 1.4.2
+           previous_tool_params: ''
+           os: macos-12
+           dotnet_version: 7.0.102
+
+         - manifest: 'manifests/uno.ui-preview.manifest.json'
+           manifest_name: Preview Upgrade
+           previous_tool_version: 1.4.2
+           previous_tool_params: '--pre'
+           os: macos-12
+           dotnet_version: 7.0.200-preview.22628.1
+
+         - manifest: 'manifests/uno.ui-preview-major.manifest.json'
+           manifest_name: Preview Upgrade net8
+           previous_tool_version: 1.4.2
+           previous_tool_params: '--pre'
+           os: macos-12
+           dotnet_version: 8.0.100-preview.1.23115.2
 
     runs-on: ${{ matrix.os }}
 
@@ -186,11 +242,17 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '3.1.x'
+
+      # Preinstall .NET as it may fail on some build agents
+      - name: Setup .NET Core ${{ matrix.dotnet_version }}
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '${{ matrix.dotnet_version }}'
 
       - name: Setup GitVersion
         uses: gittools/actions/gitversion/setup@v0.9.9
         with:
-          versionSpec: '5.x'
+          versionSpec: ${{ env.GitVersion_Version }}
 
       - name: GitVersion
         id: gitversion
@@ -236,6 +298,8 @@ jobs:
            manifest_name: Stable
          - manifest: 'manifests/uno.ui-preview.manifest.json'
            manifest_name: Preview
+         - manifest: 'manifests/uno.ui-preview-major.manifest.json'
+           manifest_name: Preview net8
 
          - manifest: 'manifests/uno.ui.manifest.json'
            manifest_name: Stable Upgrade
@@ -245,6 +309,10 @@ jobs:
            manifest_name: Preview Upgrade
            previous_tool_version: 1.4.2
            previous_tool_params: '--pre'
+         - manifest: 'manifests/uno.ui-preview-major.manifest.json'
+           manifest_name: Preview Upgrade net8
+           previous_tool_version: 1.4.2
+           previous_tool_params: '--pre'
 
     steps:
       - name: Checkout
@@ -265,7 +333,7 @@ jobs:
       - name: Setup GitVersion
         uses: gittools/actions/gitversion/setup@v0.9.9
         with:
-          versionSpec: '5.x'
+          versionSpec: ${{ env.GitVersion_Version }}
 
       - name: GitVersion
         id: gitversion
@@ -333,4 +401,4 @@ jobs:
       - name: NuGet Push
         shell: pwsh
         run: |
-          dotnet nuget push artifacts\*.nupkg -s https://api.nuget.org/v3/index.json -k ${{ secrets.NUGET_ORG_API_KEY }}
+          dotnet nuget push artifacts\*.nupkg -s https://api.nuget.org/v3/index.json -k "${{ secrets.NUGET_ORG_API_KEY }}"
diff --git a/UnoCheck.SdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/UnoCheck.SdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj
@@ -0,0 +1,62 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<TargetFramework>net472</TargetFramework>
+		<ImplicitUsings>enable</ImplicitUsings>
+		<Nullable>enable</Nullable>
+		<LangVersion>10.0</LangVersion>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<Compile Include="..\dotnet-sdk\Resolvers\Microsoft.DotNet.NativeWrapper\**\*.cs" LinkBase="Microsoft.DotNet.NativeWrapper" />
+		<Compile Include="..\dotnet-sdk\Resolvers\Microsoft.DotNet.SdkResolver\**\*.cs" LinkBase="Microsoft.DotNet.SdkResolver" />
+		<Compile Include="..\dotnet-sdk\Resolvers\Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver\CachingWorkloadResolver.cs" LinkBase="Microsoft.NET.Sdk.WorkloadMSBuildSdkResolver" />
+		<Compile Include="..\dotnet-sdk\Resolvers\Microsoft.NET.Sdk.WorkloadManifestReader\**\*.cs" LinkBase="Microsoft.NET.Sdk.WorkloadManifestReader" />
+		<Compile Include="..\dotnet-sdk\Resolvers\Microsoft.DotNet.MSBuildSdkResolver\**\*.cs" LinkBase="Microsoft.DotNet.MSBuildSdkResolver" />
+		<Compile Remove="..\dotnet-sdk\Resolvers\Microsoft.DotNet.MSBuildSdkResolver\Strings.Designer.cs" />
+
+		<Compile Include="..\dotnet-sdk\Common\EnvironmentVariableNames.cs" LinkBase="Common" />
+		<Compile Include="..\dotnet-sdk\Common\CliFolderPathCalculatorCore.cs" LinkBase="Common" />
+		<Compile Include="..\dotnet-sdk\Common\WorkloadFileBasedInstall.cs" LinkBase="Common" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.5.2145" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+		<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
+		<PackageReference Include="Microsoft.Build.Framework" Version="16.9.0" />
+		<PackageReference Include="Microsoft.Deployment.DotNet.Releases" Version="1.0.0-preview4.1.22206.3" />
+		<PackageReference Include="Microsoft.NETCore.DotNetHostResolver" Version="7.0.3" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<EmbeddedResource Update="Strings.resx" Generator="ResXFileCodeGenerator" Namespace="Microsoft.NET.Sdk.Localization" GenerateSource="true" />
+		<EmbeddedResource Update="Strings2.resx" Generator="ResXFileCodeGenerator" Namespace="Microsoft.NET.Sdk.Localization" GenerateSource="true" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <Reference Include="System.ComponentModel.DataAnnotations" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <Compile Update="Strings.Designer.cs">
+	    <DesignTime>True</DesignTime>
+	    <AutoGen>True</AutoGen>
+	    <DependentUpon>Strings.resx</DependentUpon>
+	  </Compile>
+	  <Compile Update="Strings2.Designer.cs">
+	    <DesignTime>True</DesignTime>
+	    <AutoGen>True</AutoGen>
+	    <DependentUpon>Strings2.resx</DependentUpon>
+	  </Compile>
+	</ItemGroup>
+
+	<ItemGroup>
+	  <EmbeddedResource Update="Strings.resx">
+	    <LastGenOutput>Strings.Designer.cs</LastGenOutput>
+	  </EmbeddedResource>
+	  <EmbeddedResource Update="Strings2.resx">
+	    <LastGenOutput>Strings2.Designer.cs</LastGenOutput>
+	  </EmbeddedResource>
+	</ItemGroup>
+</Project>
diff --git a/UnoCheck.SdkResolver/Strings.Designer.cs b/UnoCheck.SdkResolver/Strings.Designer.cs