Skip to content

Commit ee252dd

Browse files
joecare99joecare99
authored
Merge pull request #668 from joecare99/master
sync
2 parents aefccc3 + 5f295e9 commit ee252dd

2,779 files changed

Lines changed: 175314 additions & 16999 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,29 @@
11
.vs
22
bin
33
obj
4+
*.db
5+
*.cache
6+
*.bin
7+
*.dll
48
*.bak
59
*.user
10+
*.log
11+
*.suo
12+
*.snk
13+
**/vs
14+
**/obj
15+
**/obj.net
16+
**/bin
17+
**/Help
18+
/CSharpBible/App2
19+
/CSharpBible/Mobile
20+
/CSharpBible/Web
21+
/CSharpBible/packages
22+
/CSharpBible/Simulation
23+
/CSharpBible/DB/ADO_Test
24+
/CSharpBible/Libraries/CSFreeVision_
25+
/CSharpBible/Libraries/MathLibraryTests/TestResults
26+
/CSharpBible/Graphics/PermutationTests/TestResults
27+
/CSharpBible/MVVM_Tutorial/UWP_00_Test
28+
/CSharpBible/WinUI/App1
29+
/TestStatements/Help

‎Avalonia_Apps/AA05_CommandParCalc/AA05_CommandParCalc/AA05_CommandParCalc.csproj‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,19 @@
22
<Import Project="..\Application.props" />
33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
5+
<TargetFrameworks>net8.0</TargetFrameworks>
66
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
77
<ApplicationManifest>app.manifest</ApplicationManifest>
88
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
99
</PropertyGroup>
1010
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
1111
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
12+
<PropertyGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '9.0.100'))">
13+
<TargetFrameworks>$(TargetFrameworks);net9.0</TargetFrameworks>
14+
</PropertyGroup>
15+
<PropertyGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '10.0.100'))">
16+
<TargetFrameworks>$(TargetFrameworks);net10.0</TargetFrameworks>
17+
</PropertyGroup>
1218
<ItemGroup>
1319
<AvaloniaResource Include="Assets\**" />
1420
</ItemGroup>
@@ -48,4 +54,6 @@
4854
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
4955
</EmbeddedResource>
5056
</ItemGroup>
57+
58+
5159
</Project>

‎Avalonia_Apps/AA05_CommandParCalc/AA05_CommandParCalcTests/AA05_CommandParCalcTests.csproj‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
<Project>
22
<Import Project="..\Application.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0</TargetFrameworks>
55
<OutputType>Library</OutputType>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>
88
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
99
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
10-
10+
<PropertyGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '9.0.100'))">
11+
<TargetFrameworks>$(TargetFrameworks);net9.0</TargetFrameworks>
12+
</PropertyGroup>
13+
<PropertyGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '10.0.100'))">
14+
<TargetFrameworks>$(TargetFrameworks);net10.0</TargetFrameworks>
15+
</PropertyGroup>
1116
<ItemGroup>
1217
<PackageReference Include="Avalonia.Headless" />
1318
<PackageReference Include="Avalonia.Fonts.Inter" />

‎Avalonia_Apps/AA05_CommandParCalc/Directory.Packages.props‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,3 @@
11
<Project>
2-
<!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
3-
<PropertyGroup>
4-
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5-
</PropertyGroup>
6-
<ItemGroup>
7-
<!-- Avalonia packages -->
8-
<!-- Important: keep version in sync! -->
9-
<PackageVersion Include="Avalonia" Version="11.3.8" />
10-
<PackageVersion Include="Avalonia.Headless" Version="11.3.8" />
11-
<PackageVersion Include="Avalonia.Svg" Version="11.2.0.2" />
12-
<PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="11.3.6.2" />
13-
<PackageVersion Include="Avalonia.Themes.Fluent" Version="11.3.8" />
14-
<PackageVersion Include="Avalonia.Fonts.Inter" Version="11.3.8" />
15-
<PackageVersion Include="Avalonia.Diagnostics" Version="11.3.8" />
16-
<PackageVersion Include="Avalonia.Desktop" Version="11.3.8" />
17-
<PackageVersion Include="Avalonia.iOS" Version="11.3.7" />
18-
<PackageVersion Include="Avalonia.Browser" Version="11.3.7" />
19-
<PackageVersion Include="Avalonia.Android" Version="11.3.7" />
20-
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
21-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.10" />
22-
<PackageVersion Include="NSubstitute" Version="5.3.0" />
23-
<PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.1" />
24-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
25-
<PackageVersion Include="MSTest" Version="4.0.1" />
26-
</ItemGroup>
2+
<Import Project="..\Packages.props" />
273
</Project>

‎Avalonia_Apps/AA06_ValueConverter2/AA06_Converters4/AA06_Converters4.csproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,19 @@
22
<Import Project="..\Application.props" />
33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
5+
<TargetFrameworks>net8.0</TargetFrameworks>
66
<Nullable>enable</Nullable>
77
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
88
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
99
</PropertyGroup>
1010
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
1111
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
12+
<PropertyGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '9.0.100'))">
13+
<TargetFrameworks>$(TargetFrameworks);net9.0</TargetFrameworks>
14+
</PropertyGroup>
15+
<PropertyGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '10.0.100'))">
16+
<TargetFrameworks>$(TargetFrameworks);net10.0</TargetFrameworks>
17+
</PropertyGroup>
1218
<ItemGroup>
1319
<Compile Remove="obj\**" />
1420
<EmbeddedResource Remove="obj\**" />

‎Avalonia_Apps/AA06_ValueConverter2/AA06_Converters4Tests/AA06_Converters4Tests.csproj‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
<Project>
22
<Import Project="..\Application.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>net9.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0</TargetFrameworks>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
88
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
9+
<PropertyGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '9.0.100'))">
10+
<TargetFrameworks>$(TargetFrameworks);net9.0</TargetFrameworks>
11+
</PropertyGroup>
12+
<PropertyGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '10.0.100'))">
13+
<TargetFrameworks>$(TargetFrameworks);net10.0</TargetFrameworks>
14+
</PropertyGroup>
915

10-
<ItemGroup>
16+
<ItemGroup>
1117
<PackageReference Include="Microsoft.NET.Test.Sdk" />
1218
<PackageReference Include="MSTest" />
1319
<PackageReference Include="coverlet.collector">
@@ -23,4 +29,5 @@
2329
<ProjectReference Include="$(UpDir)\Libraries\Avln_BaseLibTests\Avln_BaseLibTests.csproj" />
2430
</ItemGroup>
2531

32+
2633
</Project>

‎Avalonia_Apps/AA06_ValueConverter2/AA06_ValueConverter2/AA06_ValueConverter2.csproj‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,19 @@
22
<Import Project="..\Application.props" />
33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
5+
<TargetFrameworks>net8.0</TargetFrameworks>
66
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
77
<ApplicationManifest>app.manifest</ApplicationManifest>
88
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
99
</PropertyGroup>
1010
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
1111
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
12+
<PropertyGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '9.0.100'))">
13+
<TargetFrameworks>$(TargetFrameworks);net9.0</TargetFrameworks>
14+
</PropertyGroup>
15+
<PropertyGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '10.0.100'))">
16+
<TargetFrameworks>$(TargetFrameworks);net10.0</TargetFrameworks>
17+
</PropertyGroup>
1218
<ItemGroup>
1319
<AvaloniaResource Include="Assets\**" />
1420
</ItemGroup>
@@ -49,4 +55,5 @@
4955
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
5056
</EmbeddedResource>
5157
</ItemGroup>
58+
5259
</Project>

‎Avalonia_Apps/AA06_ValueConverter2/AA06_ValueConverter2Tests/AA06_ValueConverter2Tests.csproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
11
<Project>
22
<Import Project="..\Application.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0</TargetFrameworks>
55
<OutputType>Library</OutputType>
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>
88
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
99
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
10+
<PropertyGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '9.0.100'))">
11+
<TargetFrameworks>$(TargetFrameworks);net9.0</TargetFrameworks>
12+
</PropertyGroup>
13+
<PropertyGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '10.0.100'))">
14+
<TargetFrameworks>$(TargetFrameworks);net10.0</TargetFrameworks>
15+
</PropertyGroup>
1016

1117
<ItemGroup>
1218
<PackageReference Include="Avalonia.Headless" />

‎Avalonia_Apps/AA06_ValueConverter2/Directory.Packages.props‎

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,3 @@
11
<Project>
2-
<!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
3-
<PropertyGroup>
4-
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5-
</PropertyGroup>
6-
<ItemGroup>
7-
<!-- Avalonia packages -->
8-
<!-- Important: keep version in sync! -->
9-
<PackageVersion Include="Avalonia" Version="11.3.8" />
10-
<PackageVersion Include="Avalonia.Headless" Version="11.3.8" />
11-
<PackageVersion Include="Avalonia.Headless.MSTest" Version="11.3.8" />
12-
<PackageVersion Include="Avalonia.Headless.XUnit" Version="11.3.8" />
13-
<PackageVersion Include="Avalonia.Svg" Version="11.2.0.2" />
14-
<PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="11.3.6.2" />
15-
<PackageVersion Include="Avalonia.Themes.Fluent" Version="11.3.8" />
16-
<PackageVersion Include="Avalonia.Fonts.Inter" Version="11.3.8" />
17-
<PackageVersion Include="Avalonia.Diagnostics" Version="11.3.8" />
18-
<PackageVersion Include="Avalonia.Desktop" Version="11.3.8" />
19-
<PackageVersion Include="Avalonia.iOS" Version="11.3.7" />
20-
<PackageVersion Include="Avalonia.Browser" Version="11.3.7" />
21-
<PackageVersion Include="Avalonia.Android" Version="11.3.7" />
22-
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
23-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.10" />
24-
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
25-
<PackageVersion Include="NSubstitute" Version="5.3.0" />
26-
<PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.1" />
27-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
28-
<PackageVersion Include="MSTest" Version="4.0.1" />
29-
<PackageVersion Include="coverlet.collector" Version="6.0.4" />
30-
</ItemGroup>
2+
<Import Project="..\Packages.props" />
313
</Project>

‎Avalonia_Apps/AA09_DialogBoxes/AA09_DialogBoxes/AA09_DialogBoxes.csproj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,18 @@
22
<Import Project="..\Application.props" />
33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
5+
<TargetFrameworks>net8.0</TargetFrameworks>
66
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
77
</PropertyGroup>
88
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
99
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
10-
<PropertyGroup>
10+
<PropertyGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '9.0.100'))">
11+
<TargetFrameworks>$(TargetFrameworks);net9.0</TargetFrameworks>
12+
</PropertyGroup>
13+
<PropertyGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '10.0.100'))">
14+
<TargetFrameworks>$(TargetFrameworks);net10.0</TargetFrameworks>
15+
</PropertyGroup>
16+
<PropertyGroup>
1117
<Nullable>enable</Nullable>
1218
<ImplicitUsings>disable</ImplicitUsings>
1319
</PropertyGroup>

0 commit comments

Comments
 (0)