diff --git a/.github/workflows/dotnet_build.yml b/.github/workflows/dotnet_build.yml index 3495832..1ae432e 100644 --- a/.github/workflows/dotnet_build.yml +++ b/.github/workflows/dotnet_build.yml @@ -21,7 +21,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 9.0.x + dotnet-version: 10.0.x - name: Set up JDK 11 uses: actions/setup-java@v4 with: @@ -57,7 +57,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 9.0.x + dotnet-version: 10.0.x - name: Setup XCode uses: maxim-lobanov/setup-xcode@v1 with: @@ -114,7 +114,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: 9.0.x + dotnet-version: 10.0.x - name: Install workloads run: | #dotnet workload install android wasm-tools maui-android dotnet workload install android wasm-tools maui-android --source https://api.nuget.org/v3/index.json diff --git a/common.props b/common.props index a6e1b57..cd7591a 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,9 @@ + - 1.1.20 + 1.2.0 + 1.1.20 ar_128.png en https://github.com/AndreasReitberger/SharedMauiCoreLibrary diff --git a/conditions.props b/conditions.props new file mode 100644 index 0000000..4e55832 --- /dev/null +++ b/conditions.props @@ -0,0 +1,9 @@ + + + + + $(DefineConstants);NEWTONSOFT + + $(DefineConstants);NET10 + + diff --git a/framework.maui.net9.props b/framework.maui.net9.props new file mode 100644 index 0000000..8bf3de4 --- /dev/null +++ b/framework.maui.net9.props @@ -0,0 +1,24 @@ + + + + net9.0;net9.0-android + + $(TargetFrameworks);net9.0-ios;net9.0-maccatalyst + + $(TargetFrameworks);net9.0-macos + $(TargetFrameworks);net9.0-windows10.0.19041.0 + + + true + true + enable + false + + 15.0 + 15.0 + 21.0 + 10.0.17763.0 + 10.0.17763.0 + 6.5 + + diff --git a/framework.maui.props b/framework.maui.props index 58137c7..f7859f6 100644 --- a/framework.maui.props +++ b/framework.maui.props @@ -1,22 +1,18 @@ - - net9.0;net9.0-android + + net10.0;net10.0-android - $(TargetFrameworks);net9.0-ios;net9.0-maccatalyst + $(TargetFrameworks);net10.0-ios;net10.0-maccatalyst - $(TargetFrameworks);net9.0-macos - $(TargetFrameworks);net9.0-windows10.0.19041.0 - + $(TargetFrameworks);net10.0-macos + $(TargetFrameworks);net10.0-windows10.0.19041.0 true true enable false - 15.0 15.0 21.0 diff --git a/src/SharedMauiCoreLibrary.Licensing/SharedMauiCoreLibrary.Licensing.csproj b/src/SharedMauiCoreLibrary.Licensing/SharedMauiCoreLibrary.Licensing.csproj index 832ab1e..e05b242 100644 --- a/src/SharedMauiCoreLibrary.Licensing/SharedMauiCoreLibrary.Licensing.csproj +++ b/src/SharedMauiCoreLibrary.Licensing/SharedMauiCoreLibrary.Licensing.csproj @@ -1,6 +1,7 @@  - + + MAUI, Utilites, Core, Library, Helper, C#, dotnet, Licensing, Handler @@ -44,8 +45,17 @@ + + + + + + + + + + - diff --git a/src/SharedMauiCoreLibrary.Test/SharedMauiCoreLibrary.Test.csproj b/src/SharedMauiCoreLibrary.Test/SharedMauiCoreLibrary.Test.csproj index d4bb834..3b0e08e 100644 --- a/src/SharedMauiCoreLibrary.Test/SharedMauiCoreLibrary.Test.csproj +++ b/src/SharedMauiCoreLibrary.Test/SharedMauiCoreLibrary.Test.csproj @@ -1,7 +1,9 @@  + - net9.0 + net9.0 + net10.0 enable enable diff --git a/src/SharedMauiCoreLibrary.sln b/src/SharedMauiCoreLibrary.sln index d4ce73e..10e8c6a 100644 --- a/src/SharedMauiCoreLibrary.sln +++ b/src/SharedMauiCoreLibrary.sln @@ -1,14 +1,17 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.2.32317.152 +# Visual Studio Version 18 +VisualStudioVersion = 18.0.11205.157 d18.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharedMauiCoreLibrary", "SharedMauiCoreLibrary\SharedMauiCoreLibrary.csproj", "{9B283D7C-1C1C-4DB6-9A2F-A10FE77D869D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{137C492A-7E0D-4B3C-8E99-F0F398DA7667}" ProjectSection(SolutionItems) = preProject ..\common.props = ..\common.props + ..\conditions.props = ..\conditions.props + ..\framework.maui.net9.props = ..\framework.maui.net9.props ..\framework.maui.props = ..\framework.maui.props + global.json = global.json nuget.config = nuget.config EndProjectSection EndProject diff --git a/src/SharedMauiCoreLibrary/SharedMauiCoreLibrary.csproj b/src/SharedMauiCoreLibrary/SharedMauiCoreLibrary.csproj index 28f26cc..3110dac 100644 --- a/src/SharedMauiCoreLibrary/SharedMauiCoreLibrary.csproj +++ b/src/SharedMauiCoreLibrary/SharedMauiCoreLibrary.csproj @@ -1,6 +1,7 @@  - + + MAUI, Utilites, Core, Library, Helper, C#, dotnet @@ -30,9 +31,19 @@ + + + + + + + + + + + + - - diff --git a/src/SharedNetCoreLibrary.Firebase/SharedNetCoreLibrary.Firebase.csproj b/src/SharedNetCoreLibrary.Firebase/SharedNetCoreLibrary.Firebase.csproj index 179b281..6968191 100644 --- a/src/SharedNetCoreLibrary.Firebase/SharedNetCoreLibrary.Firebase.csproj +++ b/src/SharedNetCoreLibrary.Firebase/SharedNetCoreLibrary.Firebase.csproj @@ -7,6 +7,7 @@ A core libray used for our .NET libraries. netstandard2.1;net8.0;net9.0 + $(TargetFrameworks);net10.0 enable diff --git a/src/SharedNetCoreLibrary/SharedNetCoreLibrary.csproj b/src/SharedNetCoreLibrary/SharedNetCoreLibrary.csproj index db5adf7..70f96c8 100644 --- a/src/SharedNetCoreLibrary/SharedNetCoreLibrary.csproj +++ b/src/SharedNetCoreLibrary/SharedNetCoreLibrary.csproj @@ -7,6 +7,7 @@ A core libray used for our .NET libraries. netstandard2.1;net8.0;net9.0 + $(TargetFrameworks);net10.0 enable @@ -17,10 +18,17 @@ - + - + diff --git a/src/global.json b/src/global.json new file mode 100644 index 0000000..4b0a005 --- /dev/null +++ b/src/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + //"version": "9.0.308", + "version": "10.0.100" + } +} \ No newline at end of file diff --git a/src/nuget.config b/src/nuget.config index 2b3587d..2535ce7 100644 --- a/src/nuget.config +++ b/src/nuget.config @@ -3,6 +3,5 @@ - \ No newline at end of file