diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui-net6/UnoWinUIQuickStart.Windows.Desktop/UnoWinUIQuickStart.Windows.Desktop.csproj b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui-net6/UnoWinUIQuickStart.Windows.Desktop/UnoWinUIQuickStart.Windows.Desktop.csproj index 41874372bc7a..a901ecbdc767 100644 --- a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui-net6/UnoWinUIQuickStart.Windows.Desktop/UnoWinUIQuickStart.Windows.Desktop.csproj +++ b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui-net6/UnoWinUIQuickStart.Windows.Desktop/UnoWinUIQuickStart.Windows.Desktop.csproj @@ -15,7 +15,8 @@ - + + diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Desktop/UnoWinUIQuickStart.Windows.Desktop.csproj b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Desktop/UnoWinUIQuickStart.Windows.Desktop.csproj index f8c3f06068ea..c81b7d52880e 100644 --- a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Desktop/UnoWinUIQuickStart.Windows.Desktop.csproj +++ b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Desktop/UnoWinUIQuickStart.Windows.Desktop.csproj @@ -15,10 +15,8 @@ - - - - + + diff --git a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/UnoWinUIQuickStart.Windows.Package.wapproj b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/UnoWinUIQuickStart.Windows.Package.wapproj index 82d8c324c4e2..64bb18ad15dc 100644 --- a/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/UnoWinUIQuickStart.Windows.Package.wapproj +++ b/src/SolutionTemplate/Uno.ProjectTemplates.Dotnet/content/unoapp-winui/UnoWinUIQuickStart.Windows.Package/UnoWinUIQuickStart.Windows.Package.wapproj @@ -66,12 +66,12 @@ - - build - - + build + + build + diff --git a/src/Uno.UI.Toolkit/Uno.UI.Toolkit.csproj b/src/Uno.UI.Toolkit/Uno.UI.Toolkit.csproj index bf66db67c174..e69a74b20fd1 100644 --- a/src/Uno.UI.Toolkit/Uno.UI.Toolkit.csproj +++ b/src/Uno.UI.Toolkit/Uno.UI.Toolkit.csproj @@ -87,9 +87,8 @@ - - 1.0.0-preview2 - + + diff --git a/src/Uno.UI/Uno.UI.Skia.csproj b/src/Uno.UI/Uno.UI.Skia.csproj index d59e5ef0421f..19345be44f4e 100644 --- a/src/Uno.UI/Uno.UI.Skia.csproj +++ b/src/Uno.UI/Uno.UI.Skia.csproj @@ -111,72 +111,4 @@ TargetFramework - - - - - - - - - - - - - - - - - - - - - - True - True - DependencyPropertyMixins.tt - - - - - - True - True - BaseActivity.Callbacks.tt - - - True - True - FrameworkElementMixins.tt - - - True - True - FrameworkElementMixins.tt - - - True - True - FrameworkElementMixins.tt - - - - - - BaseActivity.Callbacks.g.cs - - - FrameworkElementMixins.g.cs - - - DependencyPropertyMixins.g.cs - - - FrameworkElementMixins.g.cs - - - FrameworkElementMixins.g.cs - - - diff --git a/src/Uno.UWP/Microsoft/UI/IconId.cs b/src/Uno.UWP/Microsoft/UI/IconId.cs new file mode 100644 index 000000000000..0173b9c7c7ea --- /dev/null +++ b/src/Uno.UWP/Microsoft/UI/IconId.cs @@ -0,0 +1,38 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Microsoft.UI +{ + public struct IconId : IEquatable + { + public ulong Value; + + public IconId(ulong _Value) + { + Value = _Value; + } + + public static bool operator ==(IconId x, IconId y) + => x.Value == y.Value; + + public static bool operator !=(IconId x, IconId y) + => !(x == y); + + public bool Equals(IconId other) + => this == other; + + public override bool Equals(object obj) + { + if (obj is IconId) + { + IconId y = (IconId)obj; + return this == y; + } + return false; + } + + public override int GetHashCode() + => Value.GetHashCode(); + } +} diff --git a/src/Uno.UWPSyncGenerator.Reference/Uno.UWPSyncGenerator.Reference.csproj b/src/Uno.UWPSyncGenerator.Reference/Uno.UWPSyncGenerator.Reference.csproj index ebb41a2a631e..3175ac279949 100644 --- a/src/Uno.UWPSyncGenerator.Reference/Uno.UWPSyncGenerator.Reference.csproj +++ b/src/Uno.UWPSyncGenerator.Reference/Uno.UWPSyncGenerator.Reference.csproj @@ -133,7 +133,7 @@ - 1.0.0-preview3 + 1.0.0 1.0.0-experimental1 @@ -143,7 +143,7 @@ 1.0.0-experimental1 - + @@ -192,5 +192,21 @@ + + + + + + + + + + + + diff --git a/src/Uno.UWPSyncGenerator/Program.cs b/src/Uno.UWPSyncGenerator/Program.cs index 06d6804d96f9..8780e6f6c2a2 100644 --- a/src/Uno.UWPSyncGenerator/Program.cs +++ b/src/Uno.UWPSyncGenerator/Program.cs @@ -41,6 +41,8 @@ static void Main(string[] args) new SyncGenerator().Build(@"..\..\..\Uno.UI", "Uno.UI", "Microsoft.Graphics"); new SyncGenerator().Build(@"..\..\..\Uno.UI.Dispatching", "Uno.UI.Dispatching", "Microsoft.UI.Dispatching"); new SyncGenerator().Build(@"..\..\..\Uno.UI.Composition", "Uno.UI.Composition", "Microsoft.UI.Composition"); + new SyncGenerator().Build(@"..\..\..\Uno.UI.Dispatching", "Uno.UI.Dispatching", "Microsoft.UI"); + new SyncGenerator().Build(@"..\..\..\Uno.UI.Composition", "Uno.UI.Composition", "Microsoft.UI"); new SyncGenerator().Build(@"..\..\..\Uno.UI", "Uno.UI", "Microsoft.UI.Text"); new SyncGenerator().Build(@"..\..\..\Uno.UI", "Uno.UI", "Microsoft.ApplicationModel.Resources");