Skip to content

Commit

Permalink
feat: make versioned fluent resources linker friendly
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeromelaban
jeromelaban committed Sep 13, 2021
1 parent 83809f7 commit 52d3bcc
Show file tree
Hide file tree
Showing 230 changed files with 1,198 additions and 92 deletions.
60 changes: 60 additions & 0 deletions build/Uno.WinUI.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,8 @@
<reference file="Uno.dll" />
<reference file="Uno.UI.Toolkit.dll" />
<reference file="Uno.UI.FluentTheme.dll" />
<reference file="Uno.UI.FluentTheme.v1.dll" />
<reference file="Uno.UI.FluentTheme.v2.dll" />
</group>

<!-- iOS -->
Expand All @@ -138,6 +140,8 @@
<reference file="Uno.dll" />
<reference file="Uno.UI.Toolkit.dll" />
<reference file="Uno.UI.FluentTheme.dll" />
<reference file="Uno.UI.FluentTheme.v1.dll" />
<reference file="Uno.UI.FluentTheme.v2.dll" />
</group>

<!-- net6.0-ios -->
Expand All @@ -148,6 +152,8 @@
<reference file="Uno.dll" />
<reference file="Uno.UI.Toolkit.dll" />
<reference file="Uno.UI.FluentTheme.dll" />
<reference file="Uno.UI.FluentTheme.v1.dll" />
<reference file="Uno.UI.FluentTheme.v2.dll" />
</group>

<!-- net6.0-maccatalyst -->
Expand All @@ -158,6 +164,8 @@
<reference file="Uno.dll" />
<reference file="Uno.UI.Toolkit.dll" />
<reference file="Uno.UI.FluentTheme.dll" />
<reference file="Uno.UI.FluentTheme.v1.dll" />
<reference file="Uno.UI.FluentTheme.v2.dll" />
</group>

<!-- net6.0-macos -->
Expand All @@ -168,6 +176,8 @@
<reference file="Uno.dll" />
<reference file="Uno.UI.Toolkit.dll" />
<reference file="Uno.UI.FluentTheme.dll" />
<reference file="Uno.UI.FluentTheme.v1.dll" />
<reference file="Uno.UI.FluentTheme.v2.dll" />
</group>

<!-- macOS -->
Expand All @@ -178,6 +188,8 @@
<reference file="Uno.dll" />
<reference file="Uno.UI.Toolkit.dll" />
<reference file="Uno.UI.FluentTheme.dll" />
<reference file="Uno.UI.FluentTheme.v1.dll" />
<reference file="Uno.UI.FluentTheme.v2.dll" />
</group>

<!-- Android -->
Expand All @@ -189,6 +201,8 @@
<reference file="Uno.dll" />
<reference file="Uno.UI.Toolkit.dll" />
<reference file="Uno.UI.FluentTheme.dll" />
<reference file="Uno.UI.FluentTheme.v1.dll" />
<reference file="Uno.UI.FluentTheme.v2.dll" />
</group>

<!-- net6.0-android30.0 -->
Expand All @@ -200,6 +214,8 @@
<reference file="Uno.dll" />
<reference file="Uno.UI.Toolkit.dll" />
<reference file="Uno.UI.FluentTheme.dll" />
<reference file="Uno.UI.FluentTheme.v1.dll" />
<reference file="Uno.UI.FluentTheme.v2.dll" />
</group>

<!-- Windows -->
Expand Down Expand Up @@ -231,6 +247,10 @@
<file src="..\src\Uno.UI\Bin\Release\MonoAndroid11.0\*.xml" target="lib\MonoAndroid11.0" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\MonoAndroid11.0\Uno.UI.FluentTheme.dll" target="lib\MonoAndroid11.0" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\MonoAndroid11.0\Uno.UI.FluentTheme.pdb" target="lib\MonoAndroid11.0" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\MonoAndroid11.0\Uno.UI.FluentTheme.v1.dll" target="lib\MonoAndroid11.0" />

This comment has been minimized.

Sign in to view

Copy link
@Youssef1313

Youssef1313 Sep 14, 2021 •
edited
Loading

Member

@jeromelaban I recently found that I have to manually rebuild the FluentTheme.vX projects before running the samples app. I'm not sure, but I'm suspecting these paths aren't correct. Should this one be

..\src\Uno.UI.FluentTheme.v1\bin\Release\MonoAndroid11.0\Uno.UI.FluentTheme.v1.dll

(this applies in nearly all paths)
(I'm not sure if this is relevant to the issue I'm seeing, but good to confirm anyways)

This comment has been minimized.

Sign in to view

Copy link
@jeromelaban

jeromelaban Sep 14, 2021

Author Member

The path defined here is appropriate, since Uno.UI.FluentTheme references Uno.UI.FluentTheme.v1 and v2.
<file src="..\src\Uno.UI.FluentTheme\bin\Release\MonoAndroid11.0\Uno.UI.FluentTheme.v1.pdb" target="lib\MonoAndroid11.0" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\MonoAndroid11.0\Uno.UI.FluentTheme.v2.dll" target="lib\MonoAndroid11.0" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\MonoAndroid11.0\Uno.UI.FluentTheme.v2.pdb" target="lib\MonoAndroid11.0" />
<file src="..\src\Uno.UI.Toolkit\bin\Release\MonoAndroid11.0\Uno.UI.Toolkit.dll" target="lib\MonoAndroid11.0" />
<file src="..\src\Uno.UI.Toolkit\bin\Release\MonoAndroid11.0\Uno.UI.Toolkit.pdb" target="lib\MonoAndroid11.0" />

Expand All @@ -248,6 +268,10 @@
<file src="..\src\Uno.UI\Bin\Release\MonoAndroid10.0\*.xml" target="lib\MonoAndroid10.0" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\MonoAndroid10.0\Uno.UI.FluentTheme.dll" target="lib\MonoAndroid10.0" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\MonoAndroid10.0\Uno.UI.FluentTheme.pdb" target="lib\MonoAndroid10.0" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\MonoAndroid10.0\Uno.UI.FluentTheme.v1.dll" target="lib\MonoAndroid10.0" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\MonoAndroid10.0\Uno.UI.FluentTheme.v1.pdb" target="lib\MonoAndroid10.0" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\MonoAndroid10.0\Uno.UI.FluentTheme.v2.dll" target="lib\MonoAndroid10.0" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\MonoAndroid10.0\Uno.UI.FluentTheme.v2.pdb" target="lib\MonoAndroid10.0" />
<file src="..\src\Uno.UI.Toolkit\bin\Release\MonoAndroid10.0\Uno.UI.Toolkit.dll" target="lib\MonoAndroid10.0" />
<file src="..\src\Uno.UI.Toolkit\bin\Release\MonoAndroid10.0\Uno.UI.Toolkit.pdb" target="lib\MonoAndroid10.0" />

Expand All @@ -263,6 +287,10 @@
<file src="..\src\Uno.UI\bin\Release\xamarinios10\*.xml" target="lib\xamarinios10" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\xamarinios10\Uno.UI.FluentTheme.dll" target="lib\xamarinios10" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\xamarinios10\Uno.UI.FluentTheme.pdb" target="lib\xamarinios10" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\xamarinios10\Uno.UI.FluentTheme.v1.dll" target="lib\xamarinios10" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\xamarinios10\Uno.UI.FluentTheme.v1.pdb" target="lib\xamarinios10" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\xamarinios10\Uno.UI.FluentTheme.v2.dll" target="lib\xamarinios10" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\xamarinios10\Uno.UI.FluentTheme.v2.pdb" target="lib\xamarinios10" />
<file src="..\src\Uno.UI.Toolkit\bin\Release\xamarinios10\Uno.UI.Toolkit.dll" target="lib\xamarinios10" />
<file src="..\src\Uno.UI.Toolkit\bin\Release\xamarinios10\Uno.UI.Toolkit.pdb" target="lib\xamarinios10" />

Expand All @@ -278,6 +306,10 @@
<file src="..\src\Uno.UI\bin\Uno.UI.net6\Release\net6.0-ios\*.xml" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-ios\Uno.UI.FluentTheme.dll" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-ios\Uno.UI.FluentTheme.pdb" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-ios\Uno.UI.FluentTheme.v1.dll" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-ios\Uno.UI.FluentTheme.v1.pdb" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-ios\Uno.UI.FluentTheme.v2.dll" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-ios\Uno.UI.FluentTheme.v2.pdb" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.net6\Release\net6.0-ios\Uno.UI.Toolkit.dll" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.net6\Release\net6.0-ios\Uno.UI.Toolkit.pdb" target="lib\net6.0-ios" />

Expand All @@ -293,6 +325,10 @@
<file src="..\src\Uno.UI\bin\Uno.UI.net6\Release\net6.0-maccatalyst\*.xml" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-maccatalyst\Uno.UI.FluentTheme.dll" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-maccatalyst\Uno.UI.FluentTheme.pdb" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-maccatalyst\Uno.UI.FluentTheme.v1.dll" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-maccatalyst\Uno.UI.FluentTheme.v1.pdb" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-maccatalyst\Uno.UI.FluentTheme.v2.dll" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-maccatalyst\Uno.UI.FluentTheme.v2.pdb" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.net6\Release\net6.0-maccatalyst\Uno.UI.Toolkit.dll" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.net6\Release\net6.0-maccatalyst\Uno.UI.Toolkit.pdb" target="lib\net6.0-maccatalyst" />

Expand All @@ -308,6 +344,10 @@
<file src="..\src\Uno.UI\bin\Uno.UI.net6\Release\net6.0-macos\*.xml" target="lib\net6.0-macos" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-macos\Uno.UI.FluentTheme.dll" target="lib\net6.0-macos" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-macos\Uno.UI.FluentTheme.pdb" target="lib\net6.0-macos" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-macos\Uno.UI.FluentTheme.v1.dll" target="lib\net6.0-macos" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-macos\Uno.UI.FluentTheme.v1.pdb" target="lib\net6.0-macos" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-macos\Uno.UI.FluentTheme.v2.dll" target="lib\net6.0-macos" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-macos\Uno.UI.FluentTheme.v2.pdb" target="lib\net6.0-macos" />
<file src="..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.net6\Release\net6.0-macos\Uno.UI.Toolkit.dll" target="lib\net6.0-macos" />
<file src="..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.net6\Release\net6.0-macos\Uno.UI.Toolkit.pdb" target="lib\net6.0-macos" />

Expand All @@ -326,6 +366,10 @@
<file src="..\src\Uno.UI\bin\Uno.UI.net6\Release\net6.0-android\*.xml" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-android\Uno.UI.FluentTheme.dll" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-android\Uno.UI.FluentTheme.pdb" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-android\Uno.UI.FluentTheme.v1.dll" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-android\Uno.UI.FluentTheme.v1.pdb" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-android\Uno.UI.FluentTheme.v2.dll" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.net6\Release\net6.0-android\Uno.UI.FluentTheme.v2.pdb" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.net6\Release\net6.0-android\Uno.UI.Toolkit.dll" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.net6\Release\net6.0-android\Uno.UI.Toolkit.pdb" target="lib\net6.0-android30.0" />

Expand All @@ -341,6 +385,10 @@
<file src="..\src\Uno.UI\bin\Release\xamarinmac20\*.xml" target="lib\xamarinmac20" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\xamarinmac20\Uno.UI.FluentTheme.dll" target="lib\xamarinmac20" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\xamarinmac20\Uno.UI.FluentTheme.pdb" target="lib\xamarinmac20" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\xamarinmac20\Uno.UI.FluentTheme.v1.dll" target="lib\xamarinmac20" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\xamarinmac20\Uno.UI.FluentTheme.v1.pdb" target="lib\xamarinmac20" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\xamarinmac20\Uno.UI.FluentTheme.v2.dll" target="lib\xamarinmac20" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\xamarinmac20\Uno.UI.FluentTheme.v2.pdb" target="lib\xamarinmac20" />
<file src="..\src\Uno.UI.Toolkit\bin\Release\xamarinmac20\Uno.UI.Toolkit.dll" target="lib\xamarinmac20" />
<file src="..\src\Uno.UI.Toolkit\bin\Release\xamarinmac20\Uno.UI.Toolkit.pdb" target="lib\xamarinmac20" />

Expand All @@ -351,6 +399,10 @@
<file src="..\src\Uno.UI\Bin\Release\netstandard2.0\Uno.Xaml.dll" target="lib\netstandard2.0" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\netstandard2.0\Uno.UI.FluentTheme.dll" target="lib\netstandard2.0" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\netstandard2.0\Uno.UI.FluentTheme.pdb" target="lib\netstandard2.0" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\netstandard2.0\Uno.UI.FluentTheme.v1.dll" target="lib\netstandard2.0" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\netstandard2.0\Uno.UI.FluentTheme.v1.pdb" target="lib\netstandard2.0" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\netstandard2.0\Uno.UI.FluentTheme.v2.dll" target="lib\netstandard2.0" />
<file src="..\src\Uno.UI.FluentTheme\bin\Release\netstandard2.0\Uno.UI.FluentTheme.v2.pdb" target="lib\netstandard2.0" />
<file src="..\src\Uno.UI.Toolkit\bin\Release\netstandard2.0\Uno.UI.Toolkit.dll" target="lib\netstandard2.0" />
<file src="..\src\Uno.UI.Toolkit\bin\Release\netstandard2.0\Uno.UI.Toolkit.pdb" target="lib\netstandard2.0" />

Expand All @@ -367,6 +419,10 @@
<file src="..\src\Uno.UI\Bin\Uno.UI.Wasm\Release\netstandard2.0\Uno.Xaml.dll" target="uno-runtime\webassembly" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.Wasm\Release\netstandard2.0\Uno.UI.FluentTheme.dll" target="uno-runtime\webassembly" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.Wasm\Release\netstandard2.0\Uno.UI.FluentTheme.pdb" target="uno-runtime\webassembly" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.Wasm\Release\netstandard2.0\Uno.UI.FluentTheme.v1.dll" target="uno-runtime\webassembly" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.Wasm\Release\netstandard2.0\Uno.UI.FluentTheme.v1.pdb" target="uno-runtime\webassembly" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.Wasm\Release\netstandard2.0\Uno.UI.FluentTheme.v2.dll" target="uno-runtime\webassembly" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.Wasm\Release\netstandard2.0\Uno.UI.FluentTheme.v2.pdb" target="uno-runtime\webassembly" />
<file src="..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.Wasm\Release\netstandard2.0\Uno.UI.Toolkit.dll" target="uno-runtime\webassembly" />
<file src="..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.Wasm\Release\netstandard2.0\Uno.UI.Toolkit.pdb" target="uno-runtime\webassembly" />
<file src="..\src\Uno.UI.Runtime.WebAssembly.Compatibility\Bin\Release\netstandard2.0\Uno.UI.Wasm.*" target="uno-runtime\webassembly" />
Expand All @@ -383,6 +439,10 @@
<file src="..\src\Uno.UI\Bin\Uno.UI.Skia\Release\netstandard2.0\Uno.Xaml.pdb" target="uno-runtime\skia" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.Skia\Release\netstandard2.0\Uno.UI.FluentTheme.dll" target="uno-runtime\skia" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.Skia\Release\netstandard2.0\Uno.UI.FluentTheme.pdb" target="uno-runtime\skia" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.Skia\Release\netstandard2.0\Uno.UI.FluentTheme.v1.dll" target="uno-runtime\skia" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.Skia\Release\netstandard2.0\Uno.UI.FluentTheme.v1.pdb" target="uno-runtime\skia" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.Skia\Release\netstandard2.0\Uno.UI.FluentTheme.v2.dll" target="uno-runtime\skia" />
<file src="..\src\Uno.UI.FluentTheme\bin\Uno.UI.FluentTheme.Skia\Release\netstandard2.0\Uno.UI.FluentTheme.v2.pdb" target="uno-runtime\skia" />
<file src="..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.Skia\Release\netstandard2.0\Uno.UI.Toolkit.dll" target="uno-runtime\skia" />
<file src="..\src\Uno.UI.Toolkit\bin\Uno.UI.Toolkit.Skia\Release\netstandard2.0\Uno.UI.Toolkit.pdb" target="uno-runtime\skia" />

Expand Down
10 changes: 9 additions & 1 deletion src/Directory.Build.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,16 @@
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.Toolkit.net6.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.Wasm.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.Skia.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.Skia.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.net6.csproj</_AdjustedOutputProjects>

<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.v1.Wasm.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.v1.Skia.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.v1.net6.csproj</_AdjustedOutputProjects>

<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.v2.Wasm.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.v2.Skia.csproj</_AdjustedOutputProjects>
<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.UI.FluentTheme.v2.net6.csproj</_AdjustedOutputProjects>

<_AdjustedOutputProjects>$(_AdjustedOutputProjects);Uno.Xaml.net6.csproj</_AdjustedOutputProjects>
</PropertyGroup>

Expand Down
16 changes: 11 additions & 5 deletions src/SamplesApp/SamplesApp.Droid/SamplesApp.Droid.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,17 @@
<Project>{58332380-4302-4259-8F36-AF572C53827F}</Project>
<Name>Uno.UI.BindingHelper.Android</Name>
</ProjectReference>
<ProjectReference Include="..\..\Uno.UI.FluentTheme\Uno.UI.FluentTheme.csproj">
<Project>{535339e2-6c01-4478-9889-f6e76b1c00f4}</Project>
<Name>Uno.UI.FluentTheme</Name>
</ProjectReference>
</ItemGroup>
<ProjectReference Include="..\..\Uno.UI.FluentTheme\Uno.UI.FluentTheme.csproj">
<Project>{535339e2-6c01-4478-9889-f6e76b1c00f4}</Project>
<Name>Uno.UI.FluentTheme</Name>
</ProjectReference>
<ProjectReference Include="..\..\Uno.UI.FluentTheme.v1\Uno.UI.FluentTheme.v1.csproj">
<Name>Uno.UI.FluentTheme.v1</Name>
</ProjectReference>
<ProjectReference Include="..\..\Uno.UI.FluentTheme.v2\Uno.UI.FluentTheme.v2.csproj">
<Name>Uno.UI.FluentTheme.v2</Name>
</ProjectReference>
</ItemGroup>
<Import Project="..\..\SourceGenerators\sourcegenerators.local.props" />
<ItemGroup>
<Compile Include="MainActivity.cs" />
Expand Down
8 changes: 7 additions & 1 deletion src/SamplesApp/SamplesApp.iOS/SamplesApp.iOS.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,13 @@
<Project>{535339e2-6c01-4478-9889-f6e76b1c00f4}</Project>
<Name>Uno.UI.FluentTheme</Name>
</ProjectReference>
<ProjectReference Include="..\..\Uno.UI.RemoteControl\Uno.UI.RemoteControl.csproj">
<ProjectReference Include="..\..\Uno.UI.FluentTheme.v1\Uno.UI.FluentTheme.v1.csproj">
<Name>Uno.UI.FluentTheme.v1</Name>
</ProjectReference>
<ProjectReference Include="..\..\Uno.UI.FluentTheme.v2\Uno.UI.FluentTheme.v2.csproj">
<Name>Uno.UI.FluentTheme.v2</Name>
</ProjectReference>
<ProjectReference Include="..\..\Uno.UI.RemoteControl\Uno.UI.RemoteControl.csproj">
<Project>{80798130-cb7e-4968-b4f6-554cc0fc8feb}</Project>
<Name>Uno.UI.HotReload</Name>
</ProjectReference>
Expand Down
6 changes: 6 additions & 0 deletions src/SamplesApp/SamplesApp.macOS/SamplesApp.macOS.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,12 @@
<Project>{535339e2-6c01-4478-9889-f6e76b1c00f4}</Project>
<Name>Uno.UI.FluentTheme</Name>
</ProjectReference>
<ProjectReference Include="..\..\Uno.UI.FluentTheme.v1\Uno.UI.FluentTheme.v1.csproj">
<Name>Uno.UI.FluentTheme.v1</Name>
</ProjectReference>
<ProjectReference Include="..\..\Uno.UI.FluentTheme.v2\Uno.UI.FluentTheme.v2.csproj">
<Name>Uno.UI.FluentTheme.v2</Name>
</ProjectReference>
</ItemGroup>
<Import Project="..\..\SourceGenerators\sourcegenerators.local.props" />
<Import Project="..\UITests.Shared\UITests.Shared.projitems" Label="Shared" Condition="Exists('..\UITests.Shared\UITests.Shared.projitems')" />
Expand Down
Loading

0 comments on commit 52d3bcc

Please sign in to comment.