Skip to content

Commit 1aeb616

Browse files
jeromelabanjeromelaban
authored
Merge pull request #140 from unoplatform/dev/jela/single-project
fix(single): Adjust for assembly name in main assembly
2 parents 74c8321 + 1327db2 commit 1aeb616

File tree

250 files changed

+1195
-5412
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

250 files changed

+1195
-5412
lines changed

‎.github/workflows/ci.yml

Lines changed: 10 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ on:
1313
- release/**
1414

1515
env:
16-
UnoCheck_Version: '1.14.1'
17-
UnoCheck_Manifest: 'https://raw.githubusercontent.com/unoplatform/uno.check/146b0b4b23d866bef455494a12ad7ffd2f6f2d20/manifests/uno.ui.manifest.json'
16+
UnoCheck_Version: '1.27.2'
1817

1918
jobs:
2019
build:
@@ -25,23 +24,11 @@ jobs:
2524
uses: actions/checkout@v2
2625
with:
2726
fetch-depth: 0
28-
29-
- name: Setup .NET 7
30-
uses: actions/setup-dotnet@v1
31-
with:
32-
dotnet-version: '7.0.403'
33-
34-
- name: Setup GitVersion
35-
uses: gittools/actions/gitversion/setup@v0.9.9
36-
with:
37-
versionSpec: '5.x'
3827

39-
- name: GitVersion
40-
id: gitversion
41-
uses: gittools/actions/gitversion/execute@v0.9.9
28+
- uses: dotnet/nbgv@f088059084cb5d872e9d1a994433ca6440c2bf72 # v0.4.2
4229
with:
43-
useConfigFile: true
44-
configFilePath: build/gitversion.yml
30+
toolVersion: 3.6.139
31+
setAllVars: true
4532

4633
- run: |
4734
npm install -g conventional-changelog-cli@2.2.2
@@ -50,21 +37,20 @@ jobs:
5037
5138
- run: |
5239
& dotnet tool update --global uno.check --version ${{ env.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
53-
& uno-check -v --ci --non-interactive --fix --skip xcode --skip androidemulator --skip gtk3 --skip vswin --skip vsmac --manifest ${{ env.UnoCheck_Manifest }}
40+
& uno-check -v --ci --non-interactive --fix --skip xcode --skip androidemulator --skip gtk3 --skip vswin --skip vsmac
5441
name: Install .NET Workloads
5542
5643
5744
- name: Adjust msbuild task name
5845
run: |
5946
cd src
60-
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 }
47+
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 }
6148
6249
- name: Build - CI
6350
run: |
64-
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 }
65-
$adjustedPackageVersion="${{ steps.gitversion.outputs.semVer }}".ToLower();
51+
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 }
6652
$msbuild = vswhere -latest -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe
67-
& $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
53+
& $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
6854
6955
- name: Run Unit Tests
7056
run: |
@@ -85,15 +71,10 @@ jobs:
8571
uses: actions/checkout@v2
8672
with:
8773
fetch-depth: 0
88-
89-
- name: Setup .NET 7
90-
uses: actions/setup-dotnet@v1
91-
with:
92-
dotnet-version: '7.0.403'
9374

9475
- run: |
9576
& dotnet tool update --global uno.check --version ${{ env.UnoCheck_Version }} --add-source https://api.nuget.org/v3/index.json
96-
& uno-check -v --ci --non-interactive --fix --skip xcode --skip androidemulator --skip gtk3 --skip vswin --skip vsmac --manifest ${{ env.UnoCheck_Manifest }}
77+
& uno-check -v --ci --non-interactive --fix --skip xcode --skip androidemulator --skip gtk3 --skip vswin --skip vsmac
9778
name: Install .NET Workloads
9879
9980
- name: Build task project
@@ -104,7 +85,7 @@ jobs:
10485
- name: Validate Test Projects
10586
run: |
10687
$msbuild = vswhere -latest -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe
107-
& $msbuild /m /nr:false /r /p:Configuration=Release build\Uno.XamlMerge.Task-ci-only.slnf /p:AppxPackageSigningEnabled=false /p:AotAssemblies=false /p:WasmShellILLinkerEnabled=false
88+
& $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
10889
10990
publish:
11091
name: Publish

‎build/Uno.XamlMerge.Task-ci-only.slnf

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,9 @@
22
"solution": {
33
"path": "..\\src\\Uno.XamlMerge.Task.sln",
44
"projects": [
5-
"UWP\\TestLibrarySingleFile\\TestLibrarySingleFile.csproj",
6-
"UWP\\TestLibrary\\TestLibrary.csproj",
7-
"UWP\\XamlMergeUWPTest\\XamlMergeUWPTest.Droid\\XamlMergeUWPTest.Droid.csproj",
8-
"UWP\\XamlMergeUWPTest\\XamlMergeUWPTest.Shared\\XamlMergeUWPTest.Shared.shproj",
9-
"UWP\\XamlMergeUWPTest\\XamlMergeUWPTest.Skia.Gtk\\XamlMergeUWPTest.Skia.Gtk.csproj",
10-
"UWP\\XamlMergeUWPTest\\XamlMergeUWPTest.UWP\\XamlMergeUWPTest.UWP.csproj",
11-
"UWP\\XamlMergeUWPTest\\XamlMergeUWPTest.Wasm\\XamlMergeUWPTest.Wasm.csproj",
12-
"UWP\\XamlMergeUWPTest\\XamlMergeUWPTest.iOS\\XamlMergeUWPTest.iOS.csproj",
135
"Uno.XamlMerge.Task\\Uno.XamlMerge.Task.csproj",
146
"Uno.XamlMerge.Tests\\Uno.XamlMerge.Tests.csproj",
15-
"WinUI\\TestLibraryWinUI\\TestLibraryWinUI.csproj",
16-
"WinUI\\XamlMergeWinUITest.Mobile\\XamlMergeWinUITest.Mobile.csproj",
17-
"WinUI\\XamlMergeWinUITest.Shared\\XamlMergeWinUITest.Shared.shproj",
18-
"WinUI\\XamlMergeWinUITest.Skia.Gtk\\XamlMergeWinUITest.Skia.Gtk.csproj",
19-
"WinUI\\XamlMergeWinUITest.Wasm\\XamlMergeWinUITest.Wasm.csproj"
7+
"WinUI\\TestLibraryWinUI\\TestLibraryWinUI.csproj"
208
]
219
}
2210
}

‎build/gitversion.yml

Lines changed: 0 additions & 62 deletions
This file was deleted.

‎src/Directory.Build.props

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,34 @@
11
<Project ToolsVersion="15.0">
22

3-
<PropertyGroup>
4-
<Authors>unoplatform</Authors>
5-
<LangVersion>11</LangVersion>
6-
<PackageProjectUrl>https://github.com/unoplatform/uno.xamlmerge.task</PackageProjectUrl>
7-
<PackageIconUrl>https://nv-assets.azurewebsites.net/logos/uno.png</PackageIconUrl>
8-
<RepositoryUrl>https://github.com/unoplatform/uno.xamlmerge.task</RepositoryUrl>
3+
<PropertyGroup>
4+
<Authors>unoplatform</Authors>
5+
<LangVersion>11</LangVersion>
6+
<PackageProjectUrl>https://github.com/unoplatform/uno.xamlmerge.task</PackageProjectUrl>
7+
<PackageIconUrl>https://nv-assets.azurewebsites.net/logos/uno.png</PackageIconUrl>
8+
<RepositoryUrl>https://github.com/unoplatform/uno.xamlmerge.task</RepositoryUrl>
99
<RepositoryUrl>$(BUILD_REPOSITORY_URI)</RepositoryUrl>
1010
<Copyright>Copyright (C) 2015-$([System.DateTime]::Now.ToString(`yyyy`)) uno platform inc. - all rights reserved</Copyright>
1111
<Product>$(AssemblyName) ($(TargetFramework))</Product>
1212
<PackageIcon>uno-logo.png</PackageIcon>
1313
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
14+
15+
<NoWarn>$(NoWarn);NU1902;NU1903;NU1904</NoWarn>
1416
</PropertyGroup>
15-
17+
1618
<PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
1719
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
1820
</PropertyGroup>
19-
21+
2022
<PropertyGroup>
2123
<GeneratePackageOnBuild Condition="'$(Configuration)'=='Release'">true</GeneratePackageOnBuild>
2224
<IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
2325
<IsSampleProject>$(MSBuildProjectName.Contains('Sample'))</IsSampleProject>
2426
</PropertyGroup>
25-
27+
2628
<ItemGroup>
2729
<None Include="$(MSBuildThisFileDirectory)..\build\uno-logo.png" Pack="true" Visible="false" PackagePath="\"/>
2830
</ItemGroup>
29-
31+
3032
<Choose>
3133
<When Condition="'$(IsTestProject)' != 'true' and '$(SourceLinkEnabled)' != 'false' and '$(IsSampleProject)' != 'true'">
3234
<PropertyGroup>

‎src/UWP/.vsconfig

Lines changed: 0 additions & 112 deletions
This file was deleted.

0 commit comments

Comments
 (0)