Merge pull request #147 from reactivemarbles/FixNumberBox

Fix for NumberBox
reactivemarbles · Oct 13, 2024 · d02e6f8 · d02e6f8
2 parents b8f8574 + 1e705e4
commit d02e6f8
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 319 deletions.
diff --git a/.github/workflows/BuildOnly.yml b/.github/workflows/BuildOnly.yml
@@ -58,3 +58,9 @@ jobs:
  key: ${{ runner.os }}-${{ hashFiles('**/global.json', '**/*.csproj', '**/Directory.Packages.props') }}
  - name: 'Run: Compile'
  run: ./build.cmd Compile
+
+ - name: Create NuGet Artifacts
+ uses: actions/upload-artifact@master
+ with:
+ name: nuget
+ path: '**/*.nupkg'
diff --git a/Version.json b/Version.json
@@ -1,6 +1,6 @@
 {
  "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
- "version": "2.0.7",
+ "version": "2.1",
  "publicReleaseRefSpec": [
  "^refs/heads/master$",
  "^refs/heads/main$"

diff --git a/src/CrissCross.Avalonia/CrissCross.Avalonia.csproj b/src/CrissCross.Avalonia/CrissCross.Avalonia.csproj
@@ -4,6 +4,7 @@
  <TargetFrameworks>$(CrissCrossCoreTargetFrameworks);</TargetFrameworks>
  <ImplicitUsings>enable</ImplicitUsings>
  <Nullable>enable</Nullable>
+ <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/src/CrissCross.MAUI/CrissCross.MAUI.csproj b/src/CrissCross.MAUI/CrissCross.MAUI.csproj
@@ -6,7 +6,7 @@
  <UseMaui>true</UseMaui>
  <SingleProject>true</SingleProject>
  <ImplicitUsings>enable</ImplicitUsings>
-
+ <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
 
  <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
  <SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">13.1</SupportedOSPlatformVersion>

diff --git a/src/CrissCross.WPF.Plot/CrissCross.WPF.Plot.csproj b/src/CrissCross.WPF.Plot/CrissCross.WPF.Plot.csproj
@@ -8,6 +8,7 @@
  <GenerateLibraryLayout>true</GenerateLibraryLayout>
  <NoWarn>$(NoWarn);CA1812</NoWarn>
  <Authors>Chris Pulman; Adriana Segher</Authors>
+ <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/src/CrissCross.WPF.UI/Controls/NumberBox/NumberBox.xaml b/src/CrissCross.WPF.UI/Controls/NumberBox/NumberBox.xaml
@@ -152,7 +152,6 @@
  Command="{Binding Path=TemplateButtonCommand, RelativeSource={RelativeSource TemplatedParent}}"
  CommandParameter="decrement"
  Cursor="Arrow"
- FontSize="{StaticResource NumberBoxButtonIconSize}"
  Foreground="{DynamicResource TextControlButtonForeground}"
  Visibility="Collapsed">
  <controls:Button.Icon>

diff --git a/src/CrissCross.WPF.UI/CrissCross.WPF.UI.csproj b/src/CrissCross.WPF.UI/CrissCross.WPF.UI.csproj
@@ -8,6 +8,7 @@
  <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
  <GenerateLibraryLayout>true</GenerateLibraryLayout>
  <NoWarn>$(NoWarn);CA1812</NoWarn>
+ <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
  </PropertyGroup>
 
  <ItemGroup Condition="$(TargetFramework.StartsWith('net46'))">

diff --git a/src/CrissCross.WPF.WebView2/CrissCross.WPF.WebView2.csproj b/src/CrissCross.WPF.WebView2/CrissCross.WPF.WebView2.csproj
@@ -7,6 +7,7 @@
  <ProduceReferenceAssembly>True</ProduceReferenceAssembly>
  <GenerateDocumentationFile>True</GenerateDocumentationFile>
  <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/src/CrissCross.WPF/CrissCross.WPF.csproj b/src/CrissCross.WPF/CrissCross.WPF.csproj
@@ -7,6 +7,7 @@
  <ProduceReferenceAssembly>True</ProduceReferenceAssembly>
  <GenerateDocumentationFile>True</GenerateDocumentationFile>
  <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
  </PropertyGroup>
 
  <ItemGroup>
@@ -16,7 +17,7 @@
  </ItemGroup>
 
  <ItemGroup Condition="'$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'net472' Or '$(TargetFramework)' == 'net48'">
- <PackageReference Include="System.Text.Json" Version="8.0.4" />
+ <PackageReference Include="System.Text.Json" Version="8.0.5" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/src/CrissCross.WinForms/CrissCross.WinForms.csproj b/src/CrissCross.WinForms/CrissCross.WinForms.csproj
@@ -7,6 +7,7 @@
  <Nullable>enable</Nullable>
  <ProduceReferenceAssembly>True</ProduceReferenceAssembly>
  <GenerateDocumentationFile>True</GenerateDocumentationFile>
+ <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/src/CrissCross.XamForms/CrissCross.XamForms.csproj b/src/CrissCross.XamForms/CrissCross.XamForms.csproj
@@ -12,7 +12,7 @@
  </ItemGroup>
 
  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
- <PackageReference Include="System.Text.Json" Version="8.0.4" />
+ <PackageReference Include="System.Text.Json" Version="8.0.5" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/src/CrissCross.sln b/src/CrissCross.sln
diff --git a/src/CrissCross/CrissCross.csproj b/src/CrissCross/CrissCross.csproj
@@ -3,6 +3,7 @@
  <PropertyGroup>
  <TargetFrameworks>$(CrissCrossCoreTargetFrameworks);Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;MonoAndroid13.0;tizen40</TargetFrameworks>
  <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);$(CrissCrossWinTargetFrameworks)</TargetFrameworks>
+ <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
  </PropertyGroup>
 
  <ItemGroup Condition="$(TargetFramework.StartsWith('Xamarin')) or $(TargetFramework.StartsWith('MonoAndroid')) or $(TargetFramework.StartsWith('tizen'))">