From 4d9fea0bb16d9733d20566b1181358fef7cd198b Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Mon, 3 Jun 2024 11:35:20 -0400 Subject: [PATCH 1/4] chore: Remove gitversion task --- tools/Uno.Sdk.Updater/Uno.Sdk.Updater.csproj | 136 +++++++++++-------- 1 file changed, 83 insertions(+), 53 deletions(-) diff --git a/tools/Uno.Sdk.Updater/Uno.Sdk.Updater.csproj b/tools/Uno.Sdk.Updater/Uno.Sdk.Updater.csproj index 25b18102..653f701b 100644 --- a/tools/Uno.Sdk.Updater/Uno.Sdk.Updater.csproj +++ b/tools/Uno.Sdk.Updater/Uno.Sdk.Updater.csproj @@ -1,57 +1,87 @@  - - Exe - net8.0 - enable - enable - $([MSBuild]::NormalizePath('$(MSBuildThisFileDirectory)', '..', '..', 'src')) - $([MSBuild]::NormalizePath('$(TemplatesSourceDirectory)', 'Uno.Sdk')) - /config $([MSBuild]::NormalizePath('$(MSBuildThisFileDirectory)', '..', '..', 'build', 'gitversion.yml')) - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers - - - - - - $(Version) - - - <_LocalFileSystem Include="$(IntermediateOutputPath)\LocalFileSystem.cs" /> - <_FileSystemLine Include="//------------------------------------------------------------------------------" /> - <_FileSystemLine Include="// <auto-generated>" /> - <_FileSystemLine Include="// This code was auto generated by the build. Changes to this file will be lost." /> - <_FileSystemLine Include="// </auto-generated>" /> - <_FileSystemLine Include="//------------------------------------------------------------------------------" /> - <_FileSystemLine Include="using Uno.Sdk.Models%3b" /> - <_FileSystemLine Include="namespace Uno.Sdk.Updater%3b" /> - <_FileSystemLine Include="[global::System.Runtime.CompilerServices.CompilerGenerated]" /> - <_FileSystemLine Include="[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]" /> - <_FileSystemLine Include="internal static partial class LocalFileSystem" /> - <_FileSystemLine Include="{" /> - <_FileSystemLine Include="public const string TemplatesSourceDirectory = @"$(TemplatesSourceDirectory)"%3b" /> - <_FileSystemLine Include="public const string UnoSdkDirectory = @"$(UnoSdkDirectory)"%3b" /> - <_FileSystemLine Include="}" /> - - - - - - <_GeneratedCodeFiles Include="%(_LocalFileSystem.Identity)" /> - - - + + Exe + net8.0 + enable + enable + $([MSBuild]::NormalizePath('$(MSBuildThisFileDirectory)', '..', '..', 'src')) + $([MSBuild]::NormalizePath('$(TemplatesSourceDirectory)', 'Uno.Sdk')) + + + + + + + + + all + runtime; build; native; contentfiles; analyzers + + + + + + + + + <_LocalFileSystem Include="$(IntermediateOutputPath)\GitVersionInformation.g.cs" /> + <_FileSystemLine Include="//------------------------------------------------------------------------------" /> + <_FileSystemLine Include="// <auto-generated>" /> + <_FileSystemLine Include="// This code was auto generated by the build. Changes to this file will be lost." /> + <_FileSystemLine Include="// </auto-generated>" /> + <_FileSystemLine Include="//------------------------------------------------------------------------------" /> + <_FileSystemLine Include="using Uno.Sdk.Models%3b" /> + <_FileSystemLine Include="namespace Uno.Sdk.Updater%3b" /> + <_FileSystemLine Include="[global::System.Runtime.CompilerServices.CompilerGenerated]" /> + <_FileSystemLine Include="[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]" /> + <_FileSystemLine Include="internal static partial class GitVersionInformation" /> + <_FileSystemLine Include="{" /> + <_FileSystemLine Include="public const string NuGetVersion = @"$(GitVersion_FullSemVer)"%3b" /> + <_FileSystemLine Include="}" /> + + + + + + <_GeneratedCodeFiles Include="%(_LocalFileSystem.Identity)" /> + + + + + + + $(Version) + + + <_LocalFileSystem Include="$(IntermediateOutputPath)\LocalFileSystem.cs" /> + <_FileSystemLine Include="//------------------------------------------------------------------------------" /> + <_FileSystemLine Include="// <auto-generated>" /> + <_FileSystemLine Include="// This code was auto generated by the build. Changes to this file will be lost." /> + <_FileSystemLine Include="// </auto-generated>" /> + <_FileSystemLine Include="//------------------------------------------------------------------------------" /> + <_FileSystemLine Include="using Uno.Sdk.Models%3b" /> + <_FileSystemLine Include="namespace Uno.Sdk.Updater%3b" /> + <_FileSystemLine Include="[global::System.Runtime.CompilerServices.CompilerGenerated]" /> + <_FileSystemLine Include="[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]" /> + <_FileSystemLine Include="internal static partial class LocalFileSystem" /> + <_FileSystemLine Include="{" /> + <_FileSystemLine Include="public const string TemplatesSourceDirectory = @"$(TemplatesSourceDirectory)"%3b" /> + <_FileSystemLine Include="public const string UnoSdkDirectory = @"$(UnoSdkDirectory)"%3b" /> + <_FileSystemLine Include="}" /> + + + + + + <_GeneratedCodeFiles Include="%(_LocalFileSystem.Identity)" /> + + + + From 99d41ab7296de6d9288c3bc6e448dd92527f3ccc Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Mon, 3 Jun 2024 11:36:39 -0400 Subject: [PATCH 2/4] chore: adjust updater --- .github/workflows/uno-updater.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/workflows/uno-updater.yml b/.github/workflows/uno-updater.yml index 3869f675..8e07f0b1 100644 --- a/.github/workflows/uno-updater.yml +++ b/.github/workflows/uno-updater.yml @@ -25,6 +25,23 @@ jobs: with: fetch-depth: 0 + - name: Setup .NET + uses: actions/setup-dotnet@v1 + with: + dotnet-version: '8.0.300' + + - name: Setup GitVersion + uses: gittools/actions/gitversion/setup@v0.9.9 + with: + versionSpec: '5.10.3' + + - name: GitVersion + id: gitversion + uses: gittools/actions/gitversion/execute@v0.9.9 + with: + useConfigFile: true + configFilePath: build/gitversion.yml + - name: Run Uno Sdk Updater run: dotnet run --project tools/Uno.Sdk.Updater From 9568a3a6db5b696d6b25d5c1527bd769cbf1b121 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Mon, 3 Jun 2024 11:42:48 -0400 Subject: [PATCH 3/4] chore: Adjust dependency --- tools/Uno.Sdk.Updater/Uno.Sdk.Updater.csproj | 50 ++++++++++---------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/tools/Uno.Sdk.Updater/Uno.Sdk.Updater.csproj b/tools/Uno.Sdk.Updater/Uno.Sdk.Updater.csproj index 653f701b..0f97774d 100644 --- a/tools/Uno.Sdk.Updater/Uno.Sdk.Updater.csproj +++ b/tools/Uno.Sdk.Updater/Uno.Sdk.Updater.csproj @@ -14,40 +14,42 @@ - - all - runtime; build; native; contentfiles; analyzers - + - + + 255.255.255.255 + + + - <_LocalFileSystem Include="$(IntermediateOutputPath)\GitVersionInformation.g.cs" /> - <_FileSystemLine Include="//------------------------------------------------------------------------------" /> - <_FileSystemLine Include="// <auto-generated>" /> - <_FileSystemLine Include="// This code was auto generated by the build. Changes to this file will be lost." /> - <_FileSystemLine Include="// </auto-generated>" /> - <_FileSystemLine Include="//------------------------------------------------------------------------------" /> - <_FileSystemLine Include="using Uno.Sdk.Models%3b" /> - <_FileSystemLine Include="namespace Uno.Sdk.Updater%3b" /> - <_FileSystemLine Include="[global::System.Runtime.CompilerServices.CompilerGenerated]" /> - <_FileSystemLine Include="[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]" /> - <_FileSystemLine Include="internal static partial class GitVersionInformation" /> - <_FileSystemLine Include="{" /> - <_FileSystemLine Include="public const string NuGetVersion = @"$(GitVersion_FullSemVer)"%3b" /> - <_FileSystemLine Include="}" /> + <_GitVersionFileSystem Include="$(IntermediateOutputPath)\GitVersionInformation.g.cs" /> + <_GitVersionFileSystemLine Include="//------------------------------------------------------------------------------" /> + <_GitVersionFileSystemLine Include="// <auto-generated>" /> + <_GitVersionFileSystemLine Include="// This code was auto generated by the build. Changes to this file will be lost." /> + <_GitVersionFileSystemLine Include="// </auto-generated>" /> + <_GitVersionFileSystemLine Include="//------------------------------------------------------------------------------" /> + <_GitVersionFileSystemLine Include="using Uno.Sdk.Models%3b" /> + <_GitVersionFileSystemLine Include="namespace Uno.Sdk.Updater%3b" /> + <_GitVersionFileSystemLine Include="[global::System.Runtime.CompilerServices.CompilerGenerated]" /> + <_GitVersionFileSystemLine Include="[global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]" /> + <_GitVersionFileSystemLine Include="internal static partial class GitVersionInformation" /> + <_GitVersionFileSystemLine Include="{" /> + <_GitVersionFileSystemLine Include="public const string NuGetVersion = @"$(GitVersion_FullSemVer)"%3b" /> + <_GitVersionFileSystemLine Include="}" /> - - - <_GeneratedCodeFiles Include="%(_LocalFileSystem.Identity)" /> - + + <_GeneratedCodeFiles Include="%(_GitVersionFileSystem.Identity)" /> + From 05a7f54b8706336e23e80c17de2c9b4b586e36d0 Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Mon, 3 Jun 2024 11:43:19 -0400 Subject: [PATCH 4/4] chore: Adjust workflow --- .github/workflows/uno-updater.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/uno-updater.yml b/.github/workflows/uno-updater.yml index 8e07f0b1..64315c62 100644 --- a/.github/workflows/uno-updater.yml +++ b/.github/workflows/uno-updater.yml @@ -17,7 +17,7 @@ on: default: 'main' jobs: - update: + manifest-update: runs-on: windows-latest steps: - name: Checkout @@ -43,7 +43,7 @@ jobs: configFilePath: build/gitversion.yml - name: Run Uno Sdk Updater - run: dotnet run --project tools/Uno.Sdk.Updater + run: dotnet run -c Release --project tools/Uno.Sdk.Updater - name: Create Pull Request if: github.event_name != 'pull_request'