Merge pull request #140 from unoplatform/dev/jela/single-project

fix(single): Adjust for assembly name in main assembly
unoplatform · Nov 20, 2024 · 1aeb616 · 1aeb616
2 parents 74c8321 + 1327db2
commit 1aeb616
Show file tree

Hide file tree

Showing 250 changed files with 1,195 additions and 5,412 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,8 +13,7 @@ on:
       - release/**
 
 env:
-  UnoCheck_Version: '1.14.1'
-  UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/146b0b4b23d866bef455494a12ad7ffd2f6f2d20/manifests/uno.ui.manifest.json'
+  UnoCheck_Version: '1.27.2'
 
 jobs:
   build:
@@ -25,23 +24,11 @@ jobs:
       uses: actions/checkout@v2
       with:
         fetch-depth: 0
-
-    - name: Setup .NET 7
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '7.0.403'
-
-    - name: Setup GitVersion
-      uses: gittools/actions/gitversion/[email protected]
-      with:
-        versionSpec: '5.x'
 
-    - name: GitVersion
-      id: gitversion
-      uses: gittools/actions/gitversion/[email protected]
+    - uses: dotnet/nbgv@f088059084cb5d872e9d1a994433ca6440c2bf72 # v0.4.2
       with:
-        useConfigFile: true
-        configFilePath: build/gitversion.yml
+        toolVersion: 3.6.139
+        setAllVars: true
 
     - run: |
         npm install -g [email protected]
@@ -50,21 +37,20 @@ jobs:
 
     - run: |
           & dotnet tool update --global uno.check --version ${{ env.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
-          & uno-check -v --ci --non-interactive --fix --skip xcode --skip androidemulator --skip gtk3 --skip vswin --skip vsmac --manifest ${{ env.UnoCheck_Manifest }}
+          & uno-check -v --ci --non-interactive --fix --skip xcode --skip androidemulator --skip gtk3 --skip vswin --skip vsmac
       name: Install .NET Workloads
 
 
     - name: Adjust msbuild task name
       run: |
         cd src
-        gci -r -File -Include *.cs,*.targets,*.props,*.csproj | foreach-object { $a = $_.fullname; ( get-content $a ) | foreach-object { $_ -replace "v0","${{ steps.gitversion.outputs.sha }}" }  | set-content $a }
+        gci -r -File -Include *.cs,*.targets,*.props,*.csproj | foreach-object { $a = $_.fullname; ( get-content $a ) | foreach-object { $_ -replace "v0","$env:NBGV_GitCommitId" }  | set-content $a }
 
     - name: Build - CI
       run: |
-        gci -r -File -Include src\*.cs,src\*.targets,src\*.props | foreach-object { $a = $_.fullname; ( get-content $a ) | foreach-object { $_ -replace "v0","${{ steps.gitversion.outputs.sha }}" }  | set-content $a }
-        $adjustedPackageVersion="${{ steps.gitversion.outputs.semVer }}".ToLower();
+        gci -r -File -Include src\*.cs,src\*.targets,src\*.props | foreach-object { $a = $_.fullname; ( get-content $a ) | foreach-object { $_ -replace "v0","$env:NBGV_GitCommitId" }  | set-content $a }
         $msbuild = vswhere -latest -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe
-        & $msbuild /r /p:Configuration=Release /nr:false "/t:Build;Pack" /p:PackageVersion=$adjustedPackageVersion /p:Version=${{ steps.gitversion.outputs.assemblySemVer }} "/p:PackageOutputPath=$env:GITHUB_WORKSPACE\artifacts" "/p:PackageReleaseNotesFile=$env:GITHUB_WORKSPACE\build\changelog.md" src\Uno.XamlMerge.Task\Uno.XamlMerge.Task.csproj
+        & $msbuild /r /v:m /p:Configuration=Release /nr:false "/t:Build;Pack" /p:PackageVersion=$env:NBGV_SemVer2 /p:Version=$env:NBGV_SemVer2 "/p:InformationalVersion=$env:NBGV_SemVer2+$env:NBGV_BuildingRef" "/p:PackageOutputPath=$env:GITHUB_WORKSPACE\artifacts" "/p:PackageReleaseNotesFile=$env:GITHUB_WORKSPACE\build\changelog.md" src\Uno.XamlMerge.Task\Uno.XamlMerge.Task.csproj
 
     - name: Run Unit Tests
       run: |
@@ -85,15 +71,10 @@ jobs:
       uses: actions/checkout@v2
       with:
         fetch-depth: 0
-
-    - name: Setup .NET 7
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: '7.0.403'
 
     - run: |
           & dotnet tool update --global uno.check --version ${{ env.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
-          & uno-check -v --ci --non-interactive --fix --skip xcode --skip androidemulator --skip gtk3 --skip vswin --skip vsmac --manifest ${{ env.UnoCheck_Manifest }}
+          & uno-check -v --ci --non-interactive --fix --skip xcode --skip androidemulator --skip gtk3 --skip vswin --skip vsmac
       name: Install .NET Workloads
 
     - name: Build task project
@@ -104,7 +85,7 @@ jobs:
     - name: Validate Test Projects
       run: |
         $msbuild = vswhere -latest -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe
-        & $msbuild /m /nr:false /r /p:Configuration=Release build\Uno.XamlMerge.Task-ci-only.slnf /p:AppxPackageSigningEnabled=false /p:AotAssemblies=false /p:WasmShellILLinkerEnabled=false
+        & $msbuild /m /v:m /nr:false /r /p:Configuration=Release build\Uno.XamlMerge.Task-ci-only.slnf /p:AppxPackageSigningEnabled=false /p:AotAssemblies=false /p:WasmShellILLinkerEnabled=false
 
   publish:
     name: Publish

diff --git a/build/Uno.XamlMerge.Task-ci-only.slnf b/build/Uno.XamlMerge.Task-ci-only.slnf
@@ -2,21 +2,9 @@
   "solution": {
     "path": "..\\src\\Uno.XamlMerge.Task.sln",
     "projects": [
-      "UWP\\TestLibrarySingleFile\\TestLibrarySingleFile.csproj",
-      "UWP\\TestLibrary\\TestLibrary.csproj",
-      "UWP\\XamlMergeUWPTest\\XamlMergeUWPTest.Droid\\XamlMergeUWPTest.Droid.csproj",
-      "UWP\\XamlMergeUWPTest\\XamlMergeUWPTest.Shared\\XamlMergeUWPTest.Shared.shproj",
-      "UWP\\XamlMergeUWPTest\\XamlMergeUWPTest.Skia.Gtk\\XamlMergeUWPTest.Skia.Gtk.csproj",
-      "UWP\\XamlMergeUWPTest\\XamlMergeUWPTest.UWP\\XamlMergeUWPTest.UWP.csproj",
-      "UWP\\XamlMergeUWPTest\\XamlMergeUWPTest.Wasm\\XamlMergeUWPTest.Wasm.csproj",
-      "UWP\\XamlMergeUWPTest\\XamlMergeUWPTest.iOS\\XamlMergeUWPTest.iOS.csproj",
       "Uno.XamlMerge.Task\\Uno.XamlMerge.Task.csproj",
       "Uno.XamlMerge.Tests\\Uno.XamlMerge.Tests.csproj",
-      "WinUI\\TestLibraryWinUI\\TestLibraryWinUI.csproj",
-      "WinUI\\XamlMergeWinUITest.Mobile\\XamlMergeWinUITest.Mobile.csproj",
-      "WinUI\\XamlMergeWinUITest.Shared\\XamlMergeWinUITest.Shared.shproj",
-      "WinUI\\XamlMergeWinUITest.Skia.Gtk\\XamlMergeWinUITest.Skia.Gtk.csproj",
-      "WinUI\\XamlMergeWinUITest.Wasm\\XamlMergeWinUITest.Wasm.csproj"
+      "WinUI\\TestLibraryWinUI\\TestLibraryWinUI.csproj"
     ]
   }
 }
diff --git a/build/gitversion.yml b/build/gitversion.yml
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,32 +1,34 @@
 <Project ToolsVersion="15.0">
 
-  <PropertyGroup>
-    <Authors>unoplatform</Authors>
-    <LangVersion>11</LangVersion>
-    <PackageProjectUrl>https://github.com/unoplatform/uno.xamlmerge.task</PackageProjectUrl>
-    <PackageIconUrl>https://nv-assets.azurewebsites.net/logos/uno.png</PackageIconUrl>
-    <RepositoryUrl>https://github.com/unoplatform/uno.xamlmerge.task</RepositoryUrl>
+	<PropertyGroup>
+		<Authors>unoplatform</Authors>
+		<LangVersion>11</LangVersion>
+		<PackageProjectUrl>https://github.com/unoplatform/uno.xamlmerge.task</PackageProjectUrl>
+		<PackageIconUrl>https://nv-assets.azurewebsites.net/logos/uno.png</PackageIconUrl>
+		<RepositoryUrl>https://github.com/unoplatform/uno.xamlmerge.task</RepositoryUrl>
 		<RepositoryUrl>$(BUILD_REPOSITORY_URI)</RepositoryUrl>
 		<Copyright>Copyright (C) 2015-$([System.DateTime]::Now.ToString(`yyyy`)) uno platform inc. - all rights reserved</Copyright>
 		<Product>$(AssemblyName) ($(TargetFramework))</Product>
 		<PackageIcon>uno-logo.png</PackageIcon>
 		<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+
+		<NoWarn>$(NoWarn);NU1902;NU1903;NU1904</NoWarn>
 	</PropertyGroup>
-	
+
 	<PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
 		<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
 	</PropertyGroup>
-	
+
 	<PropertyGroup>
 		<GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
 		<IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
 		<IsSampleProject>$(MSBuildProjectName.Contains('Sample'))</IsSampleProject>
 	</PropertyGroup>
-	
+
 	<ItemGroup>
 		<None Include="$(MSBuildThisFileDirectory)..\build\uno-logo.png" Pack="true" Visible="false" PackagePath="\"/>
 	</ItemGroup>
-	
+
 	<Choose>
 		<When Condition="'$(IsTestProject)' != 'true' and '$(SourceLinkEnabled)' != 'false' and '$(IsSampleProject)' != 'true'">
 			<PropertyGroup>

diff --git a/src/UWP/.vsconfig b/src/UWP/.vsconfig