Skip to content

Commit

Permalink
- fix to prevent including Uno generated code in NuGets
Browse files Browse the repository at this point in the history 
- fix to include missing C#M API's for attached properties that are implemented in non-view classes
  • Loading branch information
@VincentH-Net
VincentH-Net committed Oct 13, 2023
1 parent 0c44928 commit c208ae1
Show file tree
Hide file tree
Showing 25 changed files with 17,949 additions and 5,555 deletions.
4 changes: 2 additions & 2 deletions ...Extensions.Navigation.Toolkit/CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@
</ItemGroup>

<ItemGroup Condition="$(IsUno)">
<PackageReference Include="Uno.WinUI" Version="4.10.26" />
<PackageReference Include="Uno.WinUI" Version="4.10.26" ExcludeAssets="build;analyzers" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="CSharpMarkup.WinUI" Version="$(CSharpMarkupVersion)" />
<PackageReference Include="Uno.Extensions.Navigation.Toolkit.WinUI" Version="2.5.11" />
<PackageReference Include="Uno.Extensions.Navigation.Toolkit.WinUI" Version="2.5.11" ExcludeAssets="build;analyzers" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit/Readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ This release targets WinUI 3 (Windows App SDK) and Uno Platform - including brow

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

[Release Notes](https://github.com/VincentH-Net/CSharpForMarkup/releases/tag/csharpmarkup2-winui-2-3-60-dev-1)
[Release Notes](https://github.com/VincentH-Net/CSharpForMarkup/releases/tag/csharpmarkup2-winui-2-3-60-dev-3)
4 changes: 2 additions & 2 deletions ...arkup.WinUI.Uno.Extensions.Navigation/CSharpMarkup.WinUI.Uno.Extensions.Navigation.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@
</ItemGroup>

<ItemGroup Condition="$(IsUno)">
<PackageReference Include="Uno.WinUI" Version="4.10.26" />
<PackageReference Include="Uno.Extensions.Navigation.WinUI" Version="2.5.11" />
<PackageReference Include="Uno.WinUI" Version="4.10.26" ExcludeAssets="build;analyzers" />
<PackageReference Include="Uno.Extensions.Navigation.WinUI" Version="2.5.11" ExcludeAssets="build;analyzers" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/CSharpMarkup.WinUI.Uno.Extensions.Navigation/Readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ This release targets WinUI 3 (Windows App SDK) and Uno Platform - including brow

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

[Release Notes](https://github.com/VincentH-Net/CSharpForMarkup/releases/tag/csharpmarkup2-winui-2-3-60-dev-1)
[Release Notes](https://github.com/VincentH-Net/CSharpForMarkup/releases/tag/csharpmarkup2-winui-2-3-60-dev-3)
2 changes: 1 addition & 1 deletion ...arpMarkup.WinUI.Uno.Extensions.Reactive/CSharpMarkup.WinUI.Uno.Extensions.Reactive.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@

<ItemGroup Condition="$(IsUno)">
<PackageReference Include="Uno.WinUI" Version="4.10.26" />
<PackageReference Include="Uno.Extensions.Reactive.WinUI" Version="2.5.11" />
<PackageReference Include="Uno.Extensions.Reactive.WinUI" Version="2.5.11" ExcludeAssets="build;analyzers" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/CSharpMarkup.WinUI.Uno.Extensions.Reactive/Readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ This release targets WinUI 3 (Windows App SDK) and Uno Platform - including brow

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

[Release Notes](https://github.com/VincentH-Net/CSharpForMarkup/releases/tag/csharpmarkup2-winui-2-3-60-dev-1)
[Release Notes](https://github.com/VincentH-Net/CSharpForMarkup/releases/tag/csharpmarkup2-winui-2-3-60-dev-3)
4 changes: 2 additions & 2 deletions src/CSharpMarkup.WinUI.Uno.Toolkit/CSharpMarkup.WinUI.Uno.Toolkit.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@
</ItemGroup>

<ItemGroup Condition="$(IsUno)">
<PackageReference Include="Uno.WinUI" Version="4.10.26" />
<PackageReference Include="Uno.Toolkit.WinUI" Version="4.2.22" />
<PackageReference Include="Uno.WinUI" Version="4.10.26" ExcludeAssets="build;analyzers" />
<PackageReference Include="Uno.Toolkit.WinUI" Version="4.2.22" ExcludeAssets="build;analyzers" />
</ItemGroup>

<ItemGroup>
Expand Down
612 changes: 552 additions & 60 deletions ...Generated/SourceGenerators/SourceGenerators.CsMarkupApiSourceGenerator/UnoWinUI.NET7_0.cs
View file

Large diffs are not rendered by default.

612 changes: 552 additions & 60 deletions ...d/SourceGenerators/SourceGenerators.CsMarkupApiSourceGenerator/UnoWinUI.NET7_0_ANDROID.cs
View file

Large diffs are not rendered by default.

612 changes: 552 additions & 60 deletions ...rated/SourceGenerators/SourceGenerators.CsMarkupApiSourceGenerator/UnoWinUI.NET7_0_IOS.cs
View file

Large diffs are not rendered by default.

612 changes: 552 additions & 60 deletions ...urceGenerators/SourceGenerators.CsMarkupApiSourceGenerator/UnoWinUI.NET7_0_MACCATALYST.cs
View file

Large diffs are not rendered by default.

612 changes: 552 additions & 60 deletions ...ted/SourceGenerators/SourceGenerators.CsMarkupApiSourceGenerator/UnoWinUI.NET7_0_MACOS.cs
View file

Large diffs are not rendered by default.

644 changes: 584 additions & 60 deletions ...enerators/SourceGenerators.CsMarkupApiSourceGenerator/WinUI.NET7_0_WINDOWS10_0_18362_0.cs
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion src/CSharpMarkup.WinUI.Uno.Toolkit/NavigationBar.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

namespace CSharpMarkup.WinUI.Uno.Toolkit
{
public static partial class Helpers {
public static partial class Helpers
{
/// <summary>Create a <see cref="UnoToolkitUI.NavigationBar"/> with <paramref name="Content"/> </summary>
public static NavigationBar NavigationBar(UIObject Content, params CommandBarElement[] PrimaryCommands)
{
Expand Down
2 changes: 1 addition & 1 deletion src/CSharpMarkup.WinUI.Uno.Toolkit/Readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ This release targets WinUI 3 (Windows App SDK) and Uno Platform - including brow

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

[Release Notes](https://github.com/VincentH-Net/CSharpForMarkup/releases/tag/csharpmarkup2-winui-2-3-60-dev-1)
[Release Notes](https://github.com/VincentH-Net/CSharpForMarkup/releases/tag/csharpmarkup2-winui-2-3-60-dev-3)
2 changes: 1 addition & 1 deletion src/CSharpMarkup.WinUI/CSharpMarkup.WinUI.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
</ItemGroup>

<ItemGroup Condition="$(IsUno)">
<PackageReference Include="Uno.WinUI" Version="4.10.26" />
<PackageReference Include="Uno.WinUI" Version="4.10.26" ExcludeAssets="build;analyzers" />
</ItemGroup>

<ItemGroup>
Expand Down
10 changes: 10 additions & 0 deletions src/CSharpMarkup.WinUI/FuncConverter.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,14 @@ public class NotConverter : FuncConverter<bool, bool>
public static NotConverter Instance => instance.Value;
public NotConverter() : base(t => !t, t => !t) { }
}

public class VisibilityConverter : FuncConverter<bool, Microsoft.UI.Xaml.Visibility>
{
static readonly Lazy<VisibilityConverter> instance = new Lazy<VisibilityConverter>(() => new VisibilityConverter());
public static VisibilityConverter Instance => instance.Value;
public VisibilityConverter() : base(
t => t ? Microsoft.UI.Xaml.Visibility.Visible : Microsoft.UI.Xaml.Visibility.Collapsed,
t => t == Microsoft.UI.Xaml.Visibility.Visible
) { }
}
}
Loading

0 comments on commit c208ae1

Please sign in to comment.