Skip to content

Commit c208ae1

Browse files
VincentH-NetVincentH-Net
committed
- fix to prevent including Uno generated code in NuGets
- fix to include missing C#M API's for attached properties that are implemented in non-view classes
1 parent 0c44928 commit c208ae1

25 files changed

+17949
-5555
lines changed

‎src/CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit/CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,13 @@
7676
</ItemGroup>
7777

7878
<ItemGroup Condition="$(IsUno)">
79-
<PackageReference Include="Uno.WinUI" Version="4.10.26" />
79+
<PackageReference Include="Uno.WinUI" Version="4.10.26" ExcludeAssets="build;analyzers" />
8080
</ItemGroup>
8181

8282
<ItemGroup>
8383
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
8484
<PackageReference Include="CSharpMarkup.WinUI" Version="$(CSharpMarkupVersion)" />
85-
<PackageReference Include="Uno.Extensions.Navigation.Toolkit.WinUI" Version="2.5.11" />
85+
<PackageReference Include="Uno.Extensions.Navigation.Toolkit.WinUI" Version="2.5.11" ExcludeAssets="build;analyzers" />
8686
</ItemGroup>
8787

8888
<ItemGroup>

‎src/CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit/Readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ This release targets WinUI 3 (Windows App SDK) and Uno Platform - including brow
1212

1313
[Example application](https://github.com/VincentH-Net/CSharpForMarkup/tree/master/src/CSharpMarkup.WinUI.Examples)
1414

15-
[Release Notes](https://github.com/VincentH-Net/CSharpForMarkup/releases/tag/csharpmarkup2-winui-2-3-60-dev-1)
15+
[Release Notes](https://github.com/VincentH-Net/CSharpForMarkup/releases/tag/csharpmarkup2-winui-2-3-60-dev-3)

‎src/CSharpMarkup.WinUI.Uno.Extensions.Navigation/CSharpMarkup.WinUI.Uno.Extensions.Navigation.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@
9999
</ItemGroup>
100100

101101
<ItemGroup Condition="$(IsUno)">
102-
<PackageReference Include="Uno.WinUI" Version="4.10.26" />
103-
<PackageReference Include="Uno.Extensions.Navigation.WinUI" Version="2.5.11" />
102+
<PackageReference Include="Uno.WinUI" Version="4.10.26" ExcludeAssets="build;analyzers" />
103+
<PackageReference Include="Uno.Extensions.Navigation.WinUI" Version="2.5.11" ExcludeAssets="build;analyzers" />
104104
</ItemGroup>
105105

106106
<ItemGroup>

‎src/CSharpMarkup.WinUI.Uno.Extensions.Navigation/Readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ This release targets WinUI 3 (Windows App SDK) and Uno Platform - including brow
1212

1313
[Example application](https://github.com/VincentH-Net/CSharpForMarkup/tree/master/src/CSharpMarkup.WinUI.Examples)
1414

15-
[Release Notes](https://github.com/VincentH-Net/CSharpForMarkup/releases/tag/csharpmarkup2-winui-2-3-60-dev-1)
15+
[Release Notes](https://github.com/VincentH-Net/CSharpForMarkup/releases/tag/csharpmarkup2-winui-2-3-60-dev-3)

‎src/CSharpMarkup.WinUI.Uno.Extensions.Reactive/CSharpMarkup.WinUI.Uno.Extensions.Reactive.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777

7878
<ItemGroup Condition="$(IsUno)">
7979
<PackageReference Include="Uno.WinUI" Version="4.10.26" />
80-
<PackageReference Include="Uno.Extensions.Reactive.WinUI" Version="2.5.11" />
80+
<PackageReference Include="Uno.Extensions.Reactive.WinUI" Version="2.5.11" ExcludeAssets="build;analyzers" />
8181
</ItemGroup>
8282

8383
<ItemGroup>

‎src/CSharpMarkup.WinUI.Uno.Extensions.Reactive/Readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ This release targets WinUI 3 (Windows App SDK) and Uno Platform - including brow
1212

1313
[Example application](https://github.com/VincentH-Net/CSharpForMarkup/tree/master/src/CSharpMarkup.WinUI.Examples)
1414

15-
[Release Notes](https://github.com/VincentH-Net/CSharpForMarkup/releases/tag/csharpmarkup2-winui-2-3-60-dev-1)
15+
[Release Notes](https://github.com/VincentH-Net/CSharpForMarkup/releases/tag/csharpmarkup2-winui-2-3-60-dev-3)

‎src/CSharpMarkup.WinUI.Uno.Toolkit/CSharpMarkup.WinUI.Uno.Toolkit.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@
7676
</ItemGroup>
7777

7878
<ItemGroup Condition="$(IsUno)">
79-
<PackageReference Include="Uno.WinUI" Version="4.10.26" />
80-
<PackageReference Include="Uno.Toolkit.WinUI" Version="4.2.22" />
79+
<PackageReference Include="Uno.WinUI" Version="4.10.26" ExcludeAssets="build;analyzers" />
80+
<PackageReference Include="Uno.Toolkit.WinUI" Version="4.2.22" ExcludeAssets="build;analyzers" />
8181
</ItemGroup>
8282

8383
<ItemGroup>

‎src/CSharpMarkup.WinUI.Uno.Toolkit/Generated/SourceGenerators/SourceGenerators.CsMarkupApiSourceGenerator/UnoWinUI.NET7_0.cs

Lines changed: 552 additions & 60 deletions
Large diffs are not rendered by default.

‎src/CSharpMarkup.WinUI.Uno.Toolkit/Generated/SourceGenerators/SourceGenerators.CsMarkupApiSourceGenerator/UnoWinUI.NET7_0_ANDROID.cs

Lines changed: 552 additions & 60 deletions
Large diffs are not rendered by default.

‎src/CSharpMarkup.WinUI.Uno.Toolkit/Generated/SourceGenerators/SourceGenerators.CsMarkupApiSourceGenerator/UnoWinUI.NET7_0_IOS.cs

Lines changed: 552 additions & 60 deletions
Large diffs are not rendered by default.

‎src/CSharpMarkup.WinUI.Uno.Toolkit/Generated/SourceGenerators/SourceGenerators.CsMarkupApiSourceGenerator/UnoWinUI.NET7_0_MACCATALYST.cs

Lines changed: 552 additions & 60 deletions
Large diffs are not rendered by default.

‎src/CSharpMarkup.WinUI.Uno.Toolkit/Generated/SourceGenerators/SourceGenerators.CsMarkupApiSourceGenerator/UnoWinUI.NET7_0_MACOS.cs

Lines changed: 552 additions & 60 deletions
Large diffs are not rendered by default.

‎src/CSharpMarkup.WinUI.Uno.Toolkit/Generated/SourceGenerators/SourceGenerators.CsMarkupApiSourceGenerator/WinUI.NET7_0_WINDOWS10_0_18362_0.cs

Lines changed: 584 additions & 60 deletions
Large diffs are not rendered by default.

‎src/CSharpMarkup.WinUI.Uno.Toolkit/NavigationBar.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
namespace CSharpMarkup.WinUI.Uno.Toolkit
44
{
5-
public static partial class Helpers {
5+
public static partial class Helpers
6+
{
67
/// <summary>Create a <see cref="UnoToolkitUI.NavigationBar"/> with <paramref name="Content"/> </summary>
78
public static NavigationBar NavigationBar(UIObject Content, params CommandBarElement[] PrimaryCommands)
89
{

‎src/CSharpMarkup.WinUI.Uno.Toolkit/Readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ This release targets WinUI 3 (Windows App SDK) and Uno Platform - including brow
1212

1313
[Example application](https://github.com/VincentH-Net/CSharpForMarkup/tree/master/src/CSharpMarkup.WinUI.Examples)
1414

15-
[Release Notes](https://github.com/VincentH-Net/CSharpForMarkup/releases/tag/csharpmarkup2-winui-2-3-60-dev-1)
15+
[Release Notes](https://github.com/VincentH-Net/CSharpForMarkup/releases/tag/csharpmarkup2-winui-2-3-60-dev-3)

‎src/CSharpMarkup.WinUI/CSharpMarkup.WinUI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
</ItemGroup>
7878

7979
<ItemGroup Condition="$(IsUno)">
80-
<PackageReference Include="Uno.WinUI" Version="4.10.26" />
80+
<PackageReference Include="Uno.WinUI" Version="4.10.26" ExcludeAssets="build;analyzers" />
8181
</ItemGroup>
8282

8383
<ItemGroup>

‎src/CSharpMarkup.WinUI/FuncConverter.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,4 +94,14 @@ public class NotConverter : FuncConverter<bool, bool>
9494
public static NotConverter Instance => instance.Value;
9595
public NotConverter() : base(t => !t, t => !t) { }
9696
}
97+
98+
public class VisibilityConverter : FuncConverter<bool, Microsoft.UI.Xaml.Visibility>
99+
{
100+
static readonly Lazy<VisibilityConverter> instance = new Lazy<VisibilityConverter>(() => new VisibilityConverter());
101+
public static VisibilityConverter Instance => instance.Value;
102+
public VisibilityConverter() : base(
103+
t => t ? Microsoft.UI.Xaml.Visibility.Visible : Microsoft.UI.Xaml.Visibility.Collapsed,
104+
t => t == Microsoft.UI.Xaml.Visibility.Visible
105+
) { }
106+
}
97107
}

0 commit comments

Comments
 (0)