Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add .NET 7 support #10019

Merged
merged 70 commits into from
Oct 11, 2022
Merged

feat: Add .NET 7 support #10019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
ff51cd2
ci: Adjust for warnings as errors
jeromelaban Sep 29, 2022
7e899a2
feat: Build for wasm/skia net7
jeromelaban Sep 29, 2022
958110f
ci: Adjust dependencies
jeromelaban Sep 29, 2022
a95f08b
ci: Adjust sync generation nuget restore
jeromelaban Sep 29, 2022
860745a
ci: Adjust filters
jeromelaban Sep 29, 2022
853559b
ci: Adjust .net install
jeromelaban Sep 29, 2022
a2887d4
ci: Adjust for non-netcore msbuild
jeromelaban Oct 1, 2022
74a3d75
ci: Adjust skia targets for net7
jeromelaban Oct 1, 2022
07141b0
ci: Adjust wasm targets for msbuild
jeromelaban Oct 1, 2022
dbfc4d3
ci: Adjust for missing 6.0.x SDK
jeromelaban Oct 1, 2022
dde559d
ci: adjust hyperlink for wasm
jeromelaban Oct 1, 2022
4c174eb
ci: Adjust net6 build target name after reordering
jeromelaban Oct 1, 2022
34e70f8
ci: Adjust targetframeworks for samplesapp
jeromelaban Oct 1, 2022
b7274ef
ci: Use scaled pool for winui conversion
jeromelaban Oct 1, 2022
5efe96c
ci: Adjust net7 wasm tests
jeromelaban Oct 1, 2022
89ec5f2
ci: bump nunit transform tool
jeromelaban Oct 2, 2022
728ae52
ci: Adjust t4 install
jeromelaban Oct 2, 2022
df5f197
ci: Adjust dotnet-serve version for net6
jeromelaban Oct 2, 2022
cb498ac
ci: adjust skia build name
jeromelaban Oct 2, 2022
c69bd6e
ci: Adjust skia build target
jeromelaban Oct 2, 2022
ccf3302
ci: Add reference target projects
jeromelaban Oct 2, 2022
ba7b940
ci: Adjust packages reference
jeromelaban Oct 3, 2022
a79c244
ci: Adjust wpf and reference builds
jeromelaban Oct 3, 2022
ac95e54
ci: Adjust source tree generation
jeromelaban Oct 3, 2022
fad6eb2
chore: Adjust Skia, Reference build
jeromelaban Oct 3, 2022
fac3c34
ci: Adjust net7 for Uno.Xaml
jeromelaban Oct 3, 2022
56760e4
chore: Adjust for removed t4 generator
jeromelaban Oct 3, 2022
8d17f20
ci: Adjust prepare assets for linux
jeromelaban Oct 3, 2022
cb88a63
ci: Adjust T4 running
jeromelaban Oct 3, 2022
c104de1
ci: Disable net7 build for net6 android
jeromelaban Oct 3, 2022
0c9b93a
ci: Cleanup winui sources upload
jeromelaban Oct 3, 2022
0d43e3b
ci: Adjust net7 disable for msbuild
jeromelaban Oct 3, 2022
370d4cf
ci: Adjust warnings as errors
jeromelaban Oct 4, 2022
0a076a2
ci: Adjust Skia targets warnings
jeromelaban Oct 4, 2022
ed90564
ci: Adjust skia build
jeromelaban Oct 4, 2022
0e0276e
ci: Fix CS8981 for pollfd
jeromelaban Oct 4, 2022
c99eb21
ci: Use minimal logging for msbuild
jeromelaban Oct 4, 2022
b8a58ac
ci: Adjust Uri test for net7
jeromelaban Oct 4, 2022
dc90726
ci: Adjust typescript generation for multi-targeting
jeromelaban Oct 4, 2022
b55b0e2
ci: Adjust wasm build dependencies
jeromelaban Oct 4, 2022
a33d029
ci: Avoid multiple csproj for dotnet tool
jeromelaban Oct 5, 2022
e8180ca
ci: adjust uno.ui.js injection
jeromelaban Oct 5, 2022
e685509
ci: Adjust namespace duplicates for winui
jeromelaban Oct 5, 2022
9163f7c
ci: Adjust typescript injection
jeromelaban Oct 5, 2022
2b48b9c
ci: Adjust Skia.WPF dependencies to avoid uno.ui reference loop
jeromelaban Oct 5, 2022
1a21960
ci: Adjust TS Interop tests, bump bootstrapper, local wasm build
jeromelaban Oct 5, 2022
efc2e56
ci: Remove SkiaSharp.Views.Uno transitive dependency
jeromelaban Oct 5, 2022
b311f54
ci: Adjust net7 targets for MSAL, local builds
jeromelaban Oct 5, 2022
d351e45
ci: Adjust addins packaging
jeromelaban Oct 5, 2022
5f74bca
ci: remove unused packaging steps
jeromelaban Oct 6, 2022
44254a1
ci: Add missing lottie/wasm net7 builds
jeromelaban Oct 6, 2022
41db8c3
ci: Adjust more nuspecs for net7
jeromelaban Oct 6, 2022
8274ba5
ci: Adjust wasm build
jeromelaban Oct 6, 2022
1f611fd
ci: Adjust xamlhost wpf nuspec
jeromelaban Oct 6, 2022
415338c
ci: Adjust reference target framworks comparisons
jeromelaban Oct 6, 2022
bc32f55
ci: Adjust WasmHttpHandler internals, use standard HttpClient elsewhere
jeromelaban Oct 6, 2022
3c65abe
ci: adjust runtime replace
jeromelaban Oct 6, 2022
59d072b
ci: Adjust removecontrol host build
jeromelaban Oct 6, 2022
b5b50e6
ci: Adjust skia/wasm packages copy
jeromelaban Oct 7, 2022
36525e6
ci: Add net7 template tests
jeromelaban Oct 7, 2022
d2a876b
ci: Adjust template creation parameters
jeromelaban Oct 7, 2022
3c63623
ci: Adjust for missing Microsoft.Windows.Compatibility in net7.0
jeromelaban Oct 7, 2022
9da2160
ci: Adjust invalid lottie file path
jeromelaban Oct 8, 2022
dd4f820
ci: Adjust exclude pngs and other csproj
jeromelaban Oct 8, 2022
f0d6d42
ci: Use latest bootstrapper
jeromelaban Oct 8, 2022
667dc07
ci: Adjust linker hints for new folder structure
jeromelaban Oct 8, 2022
4fed4c8
ci: Adjust warnings as errors
jeromelaban Oct 9, 2022
cbeee76
ci: Adjust comment on Skia.WPF head
jeromelaban Oct 9, 2022
5bb6909
ci: Adjust tasks names
jeromelaban Oct 9, 2022
8b36a15
docs: Adjust for net7.0 reference update
jeromelaban Oct 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion .vsts-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:

- template: build/ci/.azure-devops-winui-convert.yml
parameters:
vmImage: '$(windows2022HostedVMImage)'
poolName: '$(windowsScaledPool)'

- template: build/ci/.azure-devops-pipeline-validations.yml
parameters:
Expand All @@ -78,6 +78,18 @@ jobs:
parameters:
poolName: '$(windowsScaledPool)'

- template: build/ci/.azure-devops-package-wasm.yml
parameters:
vmImage: '$(linuxVMImage)'

- template: build/ci/.azure-devops-package-reference.yml
parameters:
vmImage: '$(linuxVMImage)'

- template: build/ci/.azure-devops-package-skia.yml
parameters:
poolName: '$(windowsScaledPool)'

- template: build/ci/.azure-devops-package.yml
parameters:
poolName: '$(windowsScaledPool)'
Expand Down
1 change: 1 addition & 0 deletions build/Uno.Foundation.Logging.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<file src="..\src\Uno.Foundation.Logging\bin\Uno.Foundation.Logging\Release\net461\*.*" target="lib\net461" />

<file src="..\src\Uno.Foundation.Logging\bin\Uno.Foundation.Logging.net6\Release\net6.0\*.*" target="lib\net6.0" />
<file src="..\src\Uno.Foundation.Logging\bin\Uno.Foundation.Logging\Release\net7.0\*.*" target="lib\net7.0" />

</files>

Expand Down
1 change: 1 addition & 0 deletions build/Uno.UI.Adapter.Microsoft.Extensions.Logging.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,6 @@

<file src="..\src\Uno.UI.Adapter.Microsoft.Extensions.Logging\bin\Uno.UI.Adapter.Microsoft.Extensions.Logging\Release\netstandard2.0\*.*" target="lib\netstandard2.0" />
<file src="..\src\Uno.UI.Adapter.Microsoft.Extensions.Logging\bin\Uno.UI.Adapter.Microsoft.Extensions.Logging.net6\Release\net6.0\*.*" target="lib\net6.0" />
<file src="..\src\Uno.UI.Adapter.Microsoft.Extensions.Logging\bin\Uno.UI.Adapter.Microsoft.Extensions.Logging\Release\net7.0\*.*" target="lib\net7.0" />
</files>
</package>
69 changes: 49 additions & 20 deletions build/Uno.UI.Build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,29 +43,22 @@
<Warning Text="Building this project under Visual Studio has no effect." />
</Target>

<Target Name="BuildGeneric" AfterTargets="Build" Condition="'$(BuildingInsideVisualStudio)'==''">

<Target Name="PrepareBuildAssets" AfterTargets="Build" Condition="'$(BuildingInsideVisualStudio)'==''">
<Message Text="Building for $(Configuration) and $(Platform) BuildReason:$(BUILD_REASON) Version:$(GitVersion_SemVer) UNO_UWP_BUILD:$(UNO_UWP_BUILD)" />

<CallTarget Targets="BuildT4Generator" />
<CallTarget Targets="UpdateFileVersions;UpdateTasksSHA;PrepareNuGetPackage" Condition="$(_isWindows)" />
</Target>

<Target Name="BuildGeneric" AfterTargets="Build" DependsOnTargets="PrepareBuildAssets" Condition="'$(BuildingInsideVisualStudio)'==''">

<CallTarget Targets="BuildCI" Condition="'$(Configuration)'=='Release' and $(_isWindows)" />

<CallTarget Targets="PublishVSIX2019" Condition="'$(Configuration)'=='Release' and $(_isWindows)" />
</Target>

<Target Name="BuildNet6" AfterTargets="Build" Condition="'$(BuildingInsideVisualStudio)'==''">
<Message Text="Building for $(Configuration) and $(Platform) BuildReason:$(BUILD_REASON) Version:$(GitVersion_SemVer) UNO_UWP_BUILD:$(UNO_UWP_BUILD)" />

<CallTarget Targets="UpdateFileVersions;UpdateTasksSHA;PrepareNuGetPackage" Condition="$(_isWindows)" />
</Target>

<Target Name="GeneratePackages" AfterTargets="Build" Condition="'$(BuildingInsideVisualStudio)'==''">

<Message Text="Building for $(Configuration) and $(Platform) BuildReason:$(BUILD_REASON) Version:$(GitVersion_SemVer) UNO_UWP_BUILD:$(UNO_UWP_BUILD)" />

<CallTarget Targets="UpdateFileVersions;UpdateTasksSHA;PrepareNuGetPackage" Condition="$(_isWindows)" />

<Target Name="GeneratePackages" AfterTargets="Build" DependsOnTargets="PrepareBuildAssets" Condition="'$(BuildingInsideVisualStudio)'==''">
<CallTarget Targets="BuildNuGetPackage" Condition="'$(Configuration)'=='Release'" />
</Target>

Expand Down Expand Up @@ -222,15 +215,14 @@
<Target Name="BuildCI">
<MSBuild Projects="..\src\Uno.UI\Uno.UI.csproj" Targets="UnoInstallDotnetT4" />
<MSBuild Properties="Configuration=Release_NoSamples;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest-generic;PackageVersion=$(GITVERSION_SemVer)"
Projects="..\src\Uno.UI-packages-no-net6.slnf"
Projects="filters\Uno.UI-packages-no-net6.slnf"
Targets="Restore;Build"
RebaseOutputs="false"
BuildInParallel="true" />

</Target>

<Target Name="BuildCINet6">
<MSBuild Projects="..\src\Uno.UI\Uno.UI.csproj" Targets="UnoInstallDotnetT4" />
<Target Name="BuildCINet6" DependsOnTargets="PrepareBuildAssets">

<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;IS_NET6_BUILD=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest-net6;PackageVersion=$(GITVERSION_SemVer)"
Projects="..\src\Uno.UI-net6-only.slnf"
Targets="Restore;Build"
Expand All @@ -239,10 +231,44 @@

</Target>

<Target Name="BuildSyncGenerator">
<Target Name="BuildCIWasm" DependsOnTargets="PrepareBuildAssets">

<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;IS_NET7_BUILD=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest-wasm;PackageVersion=$(GITVERSION_SemVer)"
Projects="filters\Uno.UI-packages-wasm.slnf"
Targets="Restore;Build"
RebaseOutputs="false"
BuildInParallel="true" />

</Target>

<Target Name="BuildCISkia" DependsOnTargets="PrepareBuildAssets">

<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;IS_NET7_BUILD=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest-skia;PackageVersion=$(GITVERSION_SemVer)"
Projects="filters\Uno.UI-packages-skia.slnf"
Targets="Restore;Build"
RebaseOutputs="false"
BuildInParallel="true" />

</Target>

<Target Name="BuildCIReference" DependsOnTargets="PrepareBuildAssets">

<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;IS_NET7_BUILD=true;_IsCIBuild=true;PackageOutputPath=$(BUILD_ARTIFACTSTAGINGDIRECTORY)\vslatest-skia;PackageVersion=$(GITVERSION_SemVer)"
Projects="filters\Uno.UI-packages-reference.slnf"
Targets="Restore;Build"
RebaseOutputs="false"
BuildInParallel="true" />

</Target>

<Target Name="BuildSyncGenerator" DependsOnTargets="BuildT4Generator">
<!-- Restore the nuget packages for the whole solution -->
<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true" Projects="..\src\Uno.UI-packages-no-net6.slnf" Targets="Restore" RebaseOutputs="false" BuildInParallel="true" />
<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true;UnoUIDisableNet7Build=true"
Projects="filters\Uno.UI-packages-no-net6.slnf;filters\Uno.UI-packages-wasm.slnf;filters\Uno.UI-packages-skia.slnf"
Targets="Restore"
RebaseOutputs="false"
BuildInParallel="true" />

<MSBuild Properties="Configuration=Release" Projects="..\src\Uno.UWPSyncGenerator\Uno.UWPSyncGenerator.csproj" Targets="Restore;Build" />

<ItemGroup>
Expand All @@ -252,14 +278,17 @@
<MixinTargetFrameworks Include="net461" />
<MixinTargetFrameworks Include="netstandard2.0" />
</ItemGroup>

<MSBuild Properties="Configuration=Release;InformationalVersion=$(GITVERSION_InformationalVersion);CI_Build=true;_IsCIBuild=true;TargetFramework=%(MixinTargetFrameworks.Identity)"
Projects="..\src\Uno.UI\Uno.UI.csproj"
Targets="GenerateMixins"
RebaseOutputs="false"
BuildInParallel="true" />
</Target>

<Target Name="BuildT4Generator">
<MSBuild Projects="..\src\Uno.UI\Uno.UI.csproj" Targets="UnoInstallDotnetT4" />
</Target>

<Target Name="GenerateDoc" DependsOnTargets="BuildSyncGenerator">

<MSBuild Properties="Configuration=Debug"
Expand Down
21 changes: 18 additions & 3 deletions build/Uno.WinUI.Lottie.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@
<dependency id="System.Json" version="4.7.1" />
</group>

<group targetFramework="net7.0">
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="System.Json" version="4.7.1" />
</group>

<group targetFramework="xamarinios10">
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="Com.Airbnb.iOS.Lottie" version="2.5.11" />
Expand Down Expand Up @@ -98,6 +103,9 @@
<group targetFramework="netstandard2.0">
<reference file="Uno.UI.Lottie.dll" />
</group>
<group targetFramework="net7.0">
<reference file="Uno.UI.Lottie.dll" />
</group>
<group targetFramework="xamarinios10">
<reference file="Uno.UI.Lottie.dll" />
</group>
Expand All @@ -115,7 +123,8 @@
</metadata>
<files>
<file src="..\src\Common\uno.png" target="/" />
<file src="..\src\AddIns\Uno.UI.Lottie\bin\Release\netstandard2.0\Uno.UI.Lottie.dll" target="lib\netstandard2.0" />
<file src="..\src\AddIns\Uno.UI.Lottie\bin\Uno.UI.Lottie.Reference\Release\netstandard2.0\Uno.UI.Lottie.dll" target="lib\netstandard2.0" />
<file src="..\src\AddIns\Uno.UI.Lottie\bin\Uno.UI.Lottie.Reference\Release\net7.0\Uno.UI.Lottie.dll" target="lib\net7.0" />
<file src="..\src\AddIns\Uno.UI.Lottie\bin\Release\xamarinios10\Uno.UI.Lottie.dll" target="lib\xamarinios10" />
<file src="..\src\AddIns\Uno.UI.Lottie\bin\Release\xamarinmac20\Uno.UI.Lottie.dll" target="lib\xamarinmac20" />
<file src="..\src\AddIns\Uno.UI.Lottie\bin\Release\MonoAndroid11.0\Uno.UI.Lottie.dll" target="lib\MonoAndroid11.0" />
Expand All @@ -129,10 +138,16 @@
<file src="..\src\AddIns\Uno.UI.Lottie\buildTransitive\*" target="buildTransitive" />

<!-- netstandard2.0 WebAssembly -->
<file src="..\src\AddIns\Uno.UI.Lottie\Bin\Uno.UI.Lottie.Wasm\Release\netstandard2.0\Uno.UI.Lottie.*" target="uno-runtime\webassembly" />
<file src="..\src\AddIns\Uno.UI.Lottie\Bin\Uno.UI.Lottie.Wasm\Release\netstandard2.0\Uno.UI.Lottie.*" target="uno-runtime\netstandard2.0\webassembly" />

<!-- netstandard2.0 Skia -->
<file src="..\src\AddIns\Uno.UI.Lottie\Bin\Uno.UI.Lottie.Skia\Release\netstandard2.0\Uno.UI.Lottie.*" target="uno-runtime\skia" />
<file src="..\src\AddIns\Uno.UI.Lottie\Bin\Uno.UI.Lottie.Skia\Release\netstandard2.0\Uno.UI.Lottie.*" target="uno-runtime\netstandard2.0\skia" />

<!-- net7.0 WebAssembly -->
<file src="..\src\AddIns\Uno.UI.Lottie\Bin\Uno.UI.Lottie.Wasm\Release\net7.0\Uno.UI.Lottie.*" target="uno-runtime\net7.0\webassembly" />

<!-- net7.0 Skia -->
<file src="..\src\AddIns\Uno.UI.Lottie\Bin\Uno.UI.Lottie.Skia\Release\net7.0\Uno.UI.Lottie.*" target="uno-runtime\net7.0\skia" />

</files>
</package>
31 changes: 21 additions & 10 deletions build/Uno.WinUI.MSAL.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,15 @@
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="Microsoft.Identity.Client" version="4.15.0" />
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="Microsoft.Identity.Client" version="4.15.0" />
</group>
<group targetFramework="UAP10.0.18362">
<group targetFramework=".NETStandard2.0">
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="Microsoft.Identity.Client" version="4.15.0" />
</group>
<group targetFramework="net7.0">
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="Microsoft.Identity.Client" version="4.15.0" />
</group>
<group targetFramework="UAP10.0.18362">
<dependency id="Microsoft.Identity.Client" version="4.15.0" />
</group>
<group targetFramework="net6.0-android30.0">
Expand Down Expand Up @@ -59,7 +63,8 @@
<files>
<file src="..\src\Common\uno.png" target="/" />

<file src="..\src\AddIns\Uno.UI.MSAL\bin\Release\netstandard2.0\Uno.UI.MSAL.*" target="lib\netstandard2.0" />
<file src="..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.Reference\Release\netstandard2.0\Uno.UI.MSAL.*" target="lib\netstandard2.0" />
<file src="..\src\AddIns\Uno.UI.MSAL\bin\Uno.UI.MSAL.Reference\Release\net7.0\Uno.UI.MSAL.*" target="lib\net7.0" />
<file src="..\src\AddIns\Uno.UI.MSAL\bin\Release\xamarinios10\Uno.UI.MSAL.*" target="lib\xamarinios10" />
<file src="..\src\AddIns\Uno.UI.MSAL\bin\Release\xamarinmac20\Uno.UI.MSAL.*" target="lib\xamarinmac20" />
<file src="..\src\AddIns\Uno.UI.MSAL\bin\Release\MonoAndroid11.0\Uno.UI.MSAL.*" target="lib\MonoAndroid11.0" />
Expand All @@ -75,11 +80,17 @@
<!-- Build targets -->
<file src="..\src\AddIns\Uno.UI.MSAL\buildTransitive\*" target="buildTransitive" />

<!-- netstandard2.0 WebAssembly -->
<file src="..\src\AddIns\Uno.UI.MSAL\Bin\Uno.UI.MSAL.Wasm\Release\netstandard2.0\Uno.UI.MSAL.*" target="uno-runtime\webassembly" />
<!-- netstandard2.0 WebAssembly -->
<file src="..\src\AddIns\Uno.UI.MSAL\Bin\Uno.UI.MSAL.Wasm\Release\netstandard2.0\Uno.UI.MSAL.*" target="uno-runtime\netstandard2.0\webassembly" />

<!-- netstandard2.0 Skia -->
<file src="..\src\AddIns\Uno.UI.MSAL\Bin\Uno.UI.MSAL.Skia\Release\netstandard2.0\Uno.UI.MSAL.*" target="uno-runtime\netstandard2.0\skia" />

<!-- net7.0 WebAssembly -->
<file src="..\src\AddIns\Uno.UI.MSAL\Bin\Uno.UI.MSAL.Wasm\Release\net7.0\Uno.UI.MSAL.*" target="uno-runtime\net7.0\webassembly" />

<!-- netstandard2.0 Skia -->
<file src="..\src\AddIns\Uno.UI.MSAL\Bin\Uno.UI.MSAL.Skia\Release\netstandard2.0\Uno.UI.MSAL.*" target="uno-runtime\skia" />
<!-- net7.0 Skia -->
<file src="..\src\AddIns\Uno.UI.MSAL\Bin\Uno.UI.MSAL.Skia\Release\net7.0\Uno.UI.MSAL.*" target="uno-runtime\net7.0\skia" />

</files>

Expand Down
42 changes: 34 additions & 8 deletions build/Uno.WinUI.RemoteControl.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,21 +80,35 @@
<dependency id="Microsoft.IO.RecyclableMemoryStream" version="2.2.0" />
</group>

<!-- .NET Standard 2.0 -->
<!-- .NET Standard 2.0 (Reference API) -->
<group targetFramework="netstandard2.0">
<dependency id="Uno.WinUI" version="1.29.0-dev.93" />

<dependency id="Newtonsoft.Json" version="12.0.2" />
<dependency id="Uno.Wasm.WebSockets" version="1.1.0" />
<dependency id="Microsoft.IO.RecyclableMemoryStream" version="2.2.0" />
</group>

<!-- .NET 7.0 (Reference API) -->
<group targetFramework="net7.0">
<dependency id="Uno.WinUI" version="1.29.0-dev.93" />

<dependency id="Newtonsoft.Json" version="12.0.2" />
<dependency id="Uno.Wasm.WebSockets" version="1.1.0" />
<dependency id="Microsoft.IO.RecyclableMemoryStream" version="2.2.0" />
</group>
</dependencies>

<references>
<!-- .NET Standard 2.0 -->
<group targetFramework="netstandard2.0">
<reference file="Uno.UI.RemoteControl.dll" />
</group>

<!-- .NET 7.0 -->
<group targetFramework="net7.0">
<reference file="Uno.UI.RemoteControl.dll" />
</group>

<!-- iOS -->
<group targetFramework="xamarinios10">
Expand Down Expand Up @@ -132,8 +146,11 @@
<files>
<file src="..\src\Common\uno.png" target="/" />
<!-- Remote Control -->
<file src="..\src\Uno.UI.RemoteControl\bin\Release\netstandard2.0\Uno.UI.RemoteControl.dll" target="lib\netstandard2.0" />
<file src="..\src\Uno.UI.RemoteControl\bin\Release\netstandard2.0\Uno.UI.RemoteControl.pdb" target="lib\netstandard2.0" />
<file src="..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.Reference\Release\netstandard2.0\Uno.UI.RemoteControl.dll" target="lib\netstandard2.0" />
<file src="..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.Reference\Release\netstandard2.0\Uno.UI.RemoteControl.pdb" target="lib\netstandard2.0" />

<file src="..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.Reference\Release\net7.0\Uno.UI.RemoteControl.dll" target="lib\net7.0" />
<file src="..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.Reference\Release\net7.0\Uno.UI.RemoteControl.pdb" target="lib\net7.0" />

<file src="..\src\Uno.UI.RemoteControl\bin\Release\MonoAndroid11.0\Uno.UI.RemoteControl.dll" target="lib\MonoAndroid11.0" />
<file src="..\src\Uno.UI.RemoteControl\bin\Release\MonoAndroid11.0\Uno.UI.RemoteControl.pdb" target="lib\MonoAndroid11.0" />
Expand Down Expand Up @@ -164,19 +181,28 @@
<file src="..\src\Uno.UI.RemoteControl.Server.Processors\bin\Release\netcoreapp3.1\*.pdb" target="tools\rc\processors\netcoreapp3.1" />
<file src="..\src\Uno.UI.RemoteControl.Server.Processors\bin\Release\net6.0\*.dll" target="tools\rc\processors\net6.0" />
<file src="..\src\Uno.UI.RemoteControl.Server.Processors\bin\Release\net6.0\*.pdb" target="tools\rc\processors\net6.0" />
<file src="..\src\Uno.UI.RemoteControl.Server.Processors\bin\Release\net7.0\*.dll" target="tools\rc\processors\net7.0" />
<file src="..\src\Uno.UI.RemoteControl.Server.Processors\bin\Release\net7.0\*.pdb" target="tools\rc\processors\net7.0" />

<!-- Build targets -->
<file src="..\src\Uno.UI.RemoteControl\buildTransitive\*" target="buildTransitive" />

<!-- netstandard2.0 WebAssembly -->
<file src="..\src\Uno.UI.RemoteControl\Bin\Uno.UI.RemoteControl.Wasm\Release\netstandard2.0\Uno.UI.RemoteControl.*" target="uno-runtime\webassembly" />
<!-- netstandard2.0 WebAssembly -->
<file src="..\src\Uno.UI.RemoteControl\Bin\Uno.UI.RemoteControl.Wasm\Release\netstandard2.0\Uno.UI.RemoteControl.*" target="uno-runtime\netstandard2.0\webassembly" />

<!-- netstandard2.0 Skia -->
<file src="..\src\Uno.UI.RemoteControl\Bin\Uno.UI.RemoteControl.Skia\Release\netstandard2.0\Uno.UI.RemoteControl.*" target="uno-runtime\netstandard2.0\skia" />

<!-- net7.0 WebAssembly -->
<file src="..\src\Uno.UI.RemoteControl\Bin\Uno.UI.RemoteControl.Wasm\Release\net7.0\Uno.UI.RemoteControl.*" target="uno-runtime\net7.0\webassembly" />

<!-- netstandard2.0 Skia -->
<file src="..\src\Uno.UI.RemoteControl\Bin\Uno.UI.RemoteControl.Skia\Release\netstandard2.0\Uno.UI.RemoteControl.*" target="uno-runtime\skia" />
<!-- net7.0 Skia -->
<file src="..\src\Uno.UI.RemoteControl\Bin\Uno.UI.RemoteControl.Skia\Release\net7.0\Uno.UI.RemoteControl.*" target="uno-runtime\net7.0\skia" />

<!-- Remote Control host and integration -->
<!-- Remote Control host and integration -->
<file src="..\src\Uno.UI.RemoteControl.Host\bin\Release\netcoreapp3.1\*.*" target="tools\rc\host\netcoreapp3.1" />
<file src="..\src\Uno.UI.RemoteControl.Host\bin\Release\net6.0\*.*" target="tools\rc\host\net6.0" />
<file src="..\src\Uno.UI.RemoteControl.Host\bin\Release\net7.0\*.*" target="tools\rc\host\net7.0" />
<file src="..\src\Uno.UI.RemoteControl.VS\bin\Release\net461\*.dll" target="tools\rc\16.0" />
<file src="..\src\Uno.UI.RemoteControl.VS\bin\Release\net461\Newtonsoft.Json.dll" target="tools\rc\16.0" />
<file src="..\src\Uno.UI.RemoteControl.VS\bin\Release\net461\*.pdb" target="tools\rc\16.0" />
Expand Down
8 changes: 7 additions & 1 deletion build/Uno.WinUI.XamlHost.Skia.Wpf.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,21 @@
<dependency id="Uno.WinUI.XamlHost" version="to-be-set-by-ci" />
<dependency id="Uno.WinUI.Runtime.Skia.Wpf" version="to-be-set-by-ci" />
</group>
<group targetFramework="net7.0">
<dependency id="Uno.WinUI.XamlHost" version="to-be-set-by-ci" />
<dependency id="Uno.WinUI.Runtime.Skia.Wpf" version="to-be-set-by-ci" />
</group>
</dependencies>
</metadata>

<files>
<file src="..\src\Common\uno.png" target="/" />

<file src="..\src\Uno.UI.XamlHost.Skia.Wpf\Bin\Release\net47\Uno.UI.XamlHost.Skia.Wpf.*" target="lib\net47" />

<file src="..\src\Uno.UI.XamlHost.Skia.Wpf\Bin\Release\netcoreapp3.1\Uno.UI.XamlHost.Skia.Wpf.*" target="lib\netcoreapp3.1" />

<file src="..\src\Uno.UI.XamlHost.Skia.Wpf\Bin\Release\net7.0-windows\Uno.UI.XamlHost.Skia.Wpf.*" target="lib\net7.0-windows" />
</files>

</package>
Loading