Skip to content

Commit

Permalink
feat: Add net6 support
Browse files Browse the repository at this point in the history
  • Loading branch information
jeromelaban committed May 14, 2021
1 parent 3dba78a commit 35efb3b
Show file tree
Hide file tree
Showing 73 changed files with 12,331 additions and 185 deletions.
14 changes: 13 additions & 1 deletion .vsts-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,19 @@ variables:
XamarinSDKVersion_iOS_UITests: 6_10_0

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

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

# - template: build/ci/.azure-devops-package-net6-mac.yml
# parameters:
# vmImage: '$(macOSVMImage)'

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

Expand Down
185 changes: 107 additions & 78 deletions build/Uno.UI.Build.csproj

Large diffs are not rendered by default.

33 changes: 30 additions & 3 deletions build/Uno.WinUI.Lottie.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,35 @@
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="System.Json" version="4.7.1" />
</group>
<group targetFramework="net6.0-ios">
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="Com.Airbnb.iOS.Lottie" version="2.5.11" />
<dependency id="System.Json" version="4.7.1" />
</group>
<group targetFramework="net6.0-catalyst">
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="Com.Airbnb.iOS.Lottie" version="2.5.11" />
<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" />
<dependency id="System.Json" version="4.7.1" />
<dependency id="System.Json" version="4.7.1" />
</group>
<group targetFramework="xamarinmac20">
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="Com.Airbnb.iOS.Lottie" version="2.5.11" />
<dependency id="System.Json" version="4.7.1" />
</group>
<group targetFramework="net6.0-android">
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="Com.Airbnb.Android.Lottie" version="3.0.4" />
<dependency id="Newtonsoft.Json" version="9.0.1" />
</group>
<group targetFramework="MonoAndroid11.0">
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
<dependency id="Com.Airbnb.Android.Lottie" version="3.0.4" />
<dependency id="Newtonsoft.Json" version="9.0.1" />
<dependency id="Newtonsoft.Json" version="9.0.1" />
</group>
<group targetFramework="MonoAndroid10.0">
<dependency id="Uno.WinUI" version="to-be-set-by-ci" />
Expand All @@ -50,7 +65,15 @@
</dependencies>

<references>
<!-- .NET Standard 2.0 -->
<group targetFramework="net6.0-ios">
<reference file="Uno.UI.Lottie.dll" />
</group>
<group targetFramework="net6.0-maccatalyst">
<reference file="Uno.UI.Lottie.dll" />
</group>
<group targetFramework="net6.0-android">
<reference file="Uno.UI.Lottie.dll" />
</group>
<group targetFramework="netstandard2.0">
<reference file="Uno.UI.Lottie.dll" />
</group>
Expand All @@ -75,6 +98,10 @@
<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" />
<file src="..\src\AddIns\Uno.UI.Lottie\bin\Release\MonoAndroid10.0\Uno.UI.Lottie.dll" target="lib\MonoAndroid10.0" />

<file src="..\src\AddIns\Uno.UI.Lottie\bin\Uno.UI.Lottie.net6\Release\net6.0-android\Uno.UI.Lottie.dll" target="lib\net6.0-android" />
<file src="..\src\AddIns\Uno.UI.Lottie\bin\Uno.UI.Lottie.net6\Release\net6.0-ios\Uno.UI.Lottie.dll" target="lib\net6.0-ios" />
<file src="..\src\AddIns\Uno.UI.Lottie\bin\Uno.UI.Lottie.net6\Release\net6.0-maccatalyst\Uno.UI.Lottie.dll" target="lib\net6.0-maccatalyst" />

<!-- Build targets -->
<file src="..\src\AddIns\Uno.UI.Lottie\buildTransitive\*" target="buildTransitive" />
Expand Down
45 changes: 43 additions & 2 deletions build/Uno.WinUI.RemoteControl.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,28 @@
<dependency id="Newtonsoft.Json" version="12.0.2" />
</group>

<!-- .NET Standard 2.0 -->
<!-- net6.0-ios -->
<group targetFramework="net6.0-ios">
<dependency id="Uno.WinUI" version="1.29.0-dev.93" />

<dependency id="Newtonsoft.Json" version="12.0.2" />
</group>

<!-- net6.0-maccatalyst -->
<group targetFramework="net6.0-maccatalyst">
<dependency id="Uno.WinUI" version="1.29.0-dev.93" />

<dependency id="Newtonsoft.Json" version="12.0.2" />
</group>

<!-- net6.0-android -->
<group targetFramework="net6.0-android">
<dependency id="Uno.WinUI" version="1.29.0-dev.93" />

<dependency id="Newtonsoft.Json" version="12.0.2" />
</group>

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

Expand Down Expand Up @@ -79,6 +100,16 @@
<reference file="Uno.UI.RemoteControl.dll" />
</group>

<!-- .NET 6 Android -->
<group targetFramework="net6.0-android">
<reference file="Uno.UI.RemoteControl.dll" />
</group>

<!-- .NET 6 iOS -->
<group targetFramework="net6.0-ios">
<reference file="Uno.UI.RemoteControl.dll" />
</group>

</references>
</metadata>

Expand All @@ -99,6 +130,15 @@
<file src="..\src\Uno.UI.RemoteControl\bin\Release\xamarinmac20\Uno.UI.RemoteControl.dll" target="lib\xamarinmac20" />
<file src="..\src\Uno.UI.RemoteControl\bin\Release\xamarinmac20\Uno.UI.RemoteControl.pdb" target="lib\xamarinmac20" />

<file src="..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.net6\Release\net6.0-android\Uno.UI.RemoteControl.dll" target="lib\net6.0-android" />
<file src="..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.net6\Release\net6.0-android\Uno.UI.RemoteControl.pdb" target="lib\net6.0-android" />

<file src="..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.net6\Release\net6.0-ios\Uno.UI.RemoteControl.dll" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.net6\Release\net6.0-ios\Uno.UI.RemoteControl.pdb" target="lib\net6.0-ios" />

<file src="..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.net6\Release\net6.0-maccatalyst\Uno.UI.RemoteControl.dll" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI.RemoteControl\bin\Uno.UI.RemoteControl.net6\Release\net6.0-maccatalyst\Uno.UI.RemoteControl.pdb" target="lib\net6.0-maccatalyst" />

<!-- Processors -->
<file src="..\src\Uno.UI.RemoteControl.Server.Processors\bin\Release\netcoreapp3.1\Uno.UI.RemoteControl.Server.Processors.dll" target="tools\rc\processors" />
<file src="..\src\Uno.UI.RemoteControl.Server.Processors\bin\Release\netcoreapp3.1\Uno.UI.RemoteControl.Server.Processors.pdb" target="tools\rc\processors" />
Expand All @@ -118,8 +158,9 @@
<file src="..\src\Uno.UI.RemoteControl.VS\bin\Release\net461\*.pdb" target="tools\rc" />
<file src="..\src\Uno.UI.RemoteControl.VS\bin\Release\net461\Newtonsoft.Json.dll" target="tools\rc" />

<!-- Force UAP to ignore netstandard 2.0 -->
<!-- Force UAP/netx-win to ignore netstandard 2.0 -->
<file src="_._" target="build\uap10.0.16299" />
<file src="_._" target="build\uap10.0.17763" />
<file src="_._" target="build\net5.0-windows" />
</files>
</package>
117 changes: 116 additions & 1 deletion build/Uno.WinUI.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,34 @@
<repository type="git" url="https://github.com/unoplatform/uno.git" branch="$branch$" commit="$commitid$" />

<dependencies>

<!-- net6.0-android30.0 -->
<group targetFramework="net6.0-android30.030">
<dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0.7-net6preview02.4535000" />
<dependency id="Xamarin.AndroidX.AppCompat" version="1.2.0.7-net6preview02.4535000" />
<dependency id="Xamarin.AndroidX.RecyclerView" version="1.1.0.8-net6preview02.4535000" />
<dependency id="Xamarin.AndroidX.Fragment" version="1.3.0.1-net6preview02.4535000" />
<dependency id="Uno.SourceGenerationTasks" version="3.1.0-dev.4" />
<dependency id="Uno.Core" version="2.4.0-dev.2" />
<dependency id="Uno.Core.Build" version="2.4.0-dev.2" />
<dependency id="Uno.Diagnostics.Eventing" version="1.0.4" />
</group>

<!-- net6.0-ios -->
<group targetFramework="net6.0-ios">
<dependency id="Uno.SourceGenerationTasks" version="3.1.0-dev.4" />
<dependency id="Uno.Core" version="2.4.0-dev.2" />
<dependency id="Uno.Core.Build" version="2.4.0-dev.2" />
<dependency id="Uno.Diagnostics.Eventing" version="1.0.4" />
</group>

<!-- net6.0-maccatalyst -->
<group targetFramework="net6.0-maccatalyst">
<dependency id="Uno.SourceGenerationTasks" version="3.1.0-dev.4" />
<dependency id="Uno.Core" version="2.4.0-dev.2" />
<dependency id="Uno.Core.Build" version="2.4.0-dev.2" />
<dependency id="Uno.Diagnostics.Eventing" version="1.0.4" />
</group>

<!-- Android 11.0 -->
<group targetFramework="MonoAndroid11.0">
Expand Down Expand Up @@ -104,6 +132,26 @@
<reference file="Uno.UI.FluentTheme.dll" />
</group>

<!-- net6.0-ios -->
<group targetFramework="net6.0-ios">
<reference file="Uno.Xaml.dll" />
<reference file="Uno.UI.dll" />
<reference file="Uno.Foundation.dll" />
<reference file="Uno.dll" />
<reference file="Uno.UI.Toolkit.dll" />
<reference file="Uno.UI.FluentTheme.dll" />
</group>

<!-- net6.0-maccatalyst -->
<group targetFramework="net6.0-maccatalyst">
<reference file="Uno.Xaml.dll" />
<reference file="Uno.UI.dll" />
<reference file="Uno.Foundation.dll" />
<reference file="Uno.dll" />
<reference file="Uno.UI.Toolkit.dll" />
<reference file="Uno.UI.FluentTheme.dll" />
</group>

<!-- macOS -->
<group targetFramework="xamarinmac20">
<reference file="Uno.Xaml.dll" />
Expand All @@ -125,6 +173,17 @@
<reference file="Uno.UI.FluentTheme.dll" />
</group>

<!-- net6.0-android30.0 -->
<group targetFramework="net6.0-android30.0">
<reference file="Uno.UI.BindingHelper.Android.dll" />
<reference file="Uno.Xaml.dll" />
<reference file="Uno.UI.dll" />
<reference file="Uno.Foundation.dll" />
<reference file="Uno.dll" />
<reference file="Uno.UI.Toolkit.dll" />
<reference file="Uno.UI.FluentTheme.dll" />
</group>

<!-- Windows -->
<group targetFramework="uap10.0.17763">
<reference file="Uno.UI.Toolkit.dll" />
Expand Down Expand Up @@ -189,6 +248,53 @@
<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" />

<!-- net6.0-ios -->
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-ios\Uno.dll" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-ios\Uno.pdb" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-ios\Uno.Foundation.dll" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-ios\Uno.Foundation.pdb" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-ios\Uno.UI.dll" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-ios\Uno.UI.pdb" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-ios\Uno.Xaml.dll" target="lib\net6.0-ios" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-ios\Uno.Xaml.pdb" target="lib\net6.0-ios" />
<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.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" />

<!-- net6.0-maccatalyst -->
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-maccatalyst\Uno.dll" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-maccatalyst\Uno.pdb" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-maccatalyst\Uno.Foundation.dll" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-maccatalyst\Uno.Foundation.pdb" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-maccatalyst\Uno.UI.dll" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-maccatalyst\Uno.UI.pdb" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-maccatalyst\Uno.Xaml.dll" target="lib\net6.0-maccatalyst" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-maccatalyst\Uno.Xaml.pdb" target="lib\net6.0-maccatalyst" />
<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.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" />

<!-- net6.0-android30.0 -->
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-android\Uno.dll" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-android\Uno.pdb" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-android\Uno.Foundation.dll" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-android\Uno.Foundation.pdb" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-android\Uno.UI.dll" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-android\Uno.UI.pdb" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-android\Uno.Xaml.dll" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-android\Uno.Xaml.pdb" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-android\Uno.UI.BindingHelper.Android.dll" target="lib\net6.0-android30.0" />
<file src="..\src\Uno.UI\Bin\Uno.UI.net6\Release\net6.0-android\Uno.UI.BindingHelper.Android.pdb" target="lib\net6.0-android30.0" />
<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.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" />

<!-- macOS -->
<file src="..\src\Uno.UI\Bin\Release\xamarinmac20\Uno.dll" target="lib\xamarinmac20" />
<file src="..\src\Uno.UI\Bin\Release\xamarinmac20\Uno.pdb" target="lib\xamarinmac20" />
Expand Down Expand Up @@ -283,16 +389,25 @@
<file src="Uno.WinUI.targets" target="buildTransitive\xamarinios10" />
<file src="Uno.WinUI.targets" target="buildTransitive\xamarinmac20" />
<file src="Uno.WinUI.targets" target="buildTransitive\netstandard2.0" />

<file src="Uno.WinUI.targets" target="buildTransitive\net6.0-android30.0" />
<file src="Uno.WinUI.targets" target="buildTransitive\net6.0-ios" />
<file src="Uno.WinUI.targets" target="buildTransitive\net6.0-catalyst" />

<file src="uno.winui.cross-runtime.targets" target="buildTransitive\MonoAndroid" />
<file src="uno.winui.cross-runtime.targets" target="buildTransitive\xamarinios10" />
<file src="uno.winui.cross-runtime.targets" target="buildTransitive\xamarinmac20" />
<file src="uno.winui.cross-runtime.targets" target="buildTransitive\netstandard2.0" />
<file src="uno.winui.cross-runtime.targets" target="buildTransitive\net6.0-android30.0" />
<file src="uno.winui.cross-runtime.targets" target="buildTransitive\net6.0-ios" />
<file src="uno.winui.cross-runtime.targets" target="buildTransitive\net6.0-catalyst" />

<file src="..\src\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" target="buildTransitive\MonoAndroid" />
<file src="..\src\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" target="buildTransitive\xamarinios10" />
<file src="..\src\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" target="buildTransitive\xamarinmac20" />
<file src="..\src\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" target="buildTransitive\netstandard2.0" />
<file src="..\src\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" target="buildTransitive\net6.0-android30.0" />
<file src="..\src\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" target="buildTransitive\net6.0-ios" />
<file src="..\src\SourceGenerators\Uno.UI.Tasks\Content\Uno.UI.Tasks.targets" target="buildTransitive\net6.0-catalyst" />

<!-- Force UAP to ignore netstandard 2.0 -->
<file src="uno.winui.uap.targets" target="buildTransitive\uap10.0.16299\uno.winui.targets" />
Expand Down
Loading

0 comments on commit 35efb3b

Please sign in to comment.