diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index eafbd4c8..4ef7f212 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - os: [windows-latest, macos-16] + os: [windows-latest, macos-15] steps: - name: Prepare variables on Windows @@ -26,7 +26,7 @@ jobs: echo "WORKING_DIRECTORY_PATH=C:/Projects/MauiSamples" >> $env:GITHUB_ENV - name: Prepare variables on macOS - if: ${{ matrix.os == 'macos-16' }} + if: ${{ matrix.os == 'macos-15' }} run: | echo "WORKING_DIRECTORY_PATH=/Users/runner/Projects/MauiSamples" >> $GITHUB_ENV @@ -37,16 +37,15 @@ jobs: git checkout ${{ github.head_ref || github.ref_name }} - name: Setup Xcode - if: ${{ matrix.os == 'macos-16' }} + if: ${{ matrix.os == 'macos-15' }} uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: '16.0' + xcode-version: '16.2' - name: Setup .NET - uses: actions/setup-dotnet@v4 + uses: actions/setup-dotnet@main with: dotnet-version: 9.x - dotnet-quality: 'preview' - name: Install dependencies run: dotnet workload install maui @@ -55,4 +54,4 @@ jobs: run: | cd ${{ env.WORKING_DIRECTORY_PATH }} dotnet restore --configfile NuGet.config - dotnet build -с Release + dotnet build --configuration Release diff --git a/AndroidBindableLibraries/Balloon/Balloon.csproj b/AndroidBindableLibraries/Balloon/Balloon.csproj index 26c4fcba..49b028bf 100644 --- a/AndroidBindableLibraries/Balloon/Balloon.csproj +++ b/AndroidBindableLibraries/Balloon/Balloon.csproj @@ -1,4 +1,4 @@ - + 23 VladislavAntonyuk.$(AssemblyName) diff --git a/AndroidBindableLibraries/Directory.Packages.props b/AndroidBindableLibraries/Directory.Packages.props deleted file mode 100644 index 6e85a9c9..00000000 --- a/AndroidBindableLibraries/Directory.Packages.props +++ /dev/null @@ -1,34 +0,0 @@ - - - true - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Database/Sqlite/MauiSqlite/MauiSqlite.csproj b/Database/Sqlite/MauiSqlite/MauiSqlite.csproj index 2bd3244a..87875cdb 100644 --- a/Database/Sqlite/MauiSqlite/MauiSqlite.csproj +++ b/Database/Sqlite/MauiSqlite/MauiSqlite.csproj @@ -24,7 +24,7 @@ - + diff --git a/Database/Sqlite/MauiSqliteBlazor/MauiSqliteBlazor.csproj b/Database/Sqlite/MauiSqliteBlazor/MauiSqliteBlazor.csproj index 0034224e..df1ddb3e 100644 --- a/Database/Sqlite/MauiSqliteBlazor/MauiSqliteBlazor.csproj +++ b/Database/Sqlite/MauiSqliteBlazor/MauiSqliteBlazor.csproj @@ -25,7 +25,7 @@ - + diff --git a/Directory.Packages.props b/Directory.Packages.props index 59ccd3d2..dce38406 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,57 +5,51 @@ - + - - + + - + - - + - - - - + + + + - + - - - - - + + + + - - - - - + + - @@ -64,27 +58,21 @@ - - - - - + - - + - + - - + + - - + - + \ No newline at end of file diff --git a/MauiTests/Client.Android.UITests/Client.Android.UITests.csproj b/MauiTests/Client.Android.UITests/Client.Android.UITests.csproj index 3f3b36a6..1c8d0b82 100644 --- a/MauiTests/Client.Android.UITests/Client.Android.UITests.csproj +++ b/MauiTests/Client.Android.UITests/Client.Android.UITests.csproj @@ -3,23 +3,11 @@ $(NetVersion) Client.UITests + Exe - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - + diff --git a/MauiTests/Client.MacCatalyst.UITests/Client.MacCatalyst.UITests.csproj b/MauiTests/Client.MacCatalyst.UITests/Client.MacCatalyst.UITests.csproj index 11264e5f..1a131c44 100644 --- a/MauiTests/Client.MacCatalyst.UITests/Client.MacCatalyst.UITests.csproj +++ b/MauiTests/Client.MacCatalyst.UITests/Client.MacCatalyst.UITests.csproj @@ -3,23 +3,11 @@ $(NetVersion) Client.UITests + Exe - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - + diff --git a/MauiTests/Client.Windows.UITests/Client.Windows.UITests.csproj b/MauiTests/Client.Windows.UITests/Client.Windows.UITests.csproj index 6d974822..4d6b4823 100644 --- a/MauiTests/Client.Windows.UITests/Client.Windows.UITests.csproj +++ b/MauiTests/Client.Windows.UITests/Client.Windows.UITests.csproj @@ -3,23 +3,11 @@ $(NetVersion) Client.UITests + Exe - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - + diff --git a/MauiTests/Client.iOS.UITests/Client.iOS.UITests.csproj b/MauiTests/Client.iOS.UITests/Client.iOS.UITests.csproj index 3a31cca8..94f0953c 100644 --- a/MauiTests/Client.iOS.UITests/Client.iOS.UITests.csproj +++ b/MauiTests/Client.iOS.UITests/Client.iOS.UITests.csproj @@ -3,23 +3,11 @@ $(NetVersion) Client.UITests + Exe - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - + diff --git a/iOSExtensions/Directory.Packages.props b/iOSExtensions/Directory.Packages.props index 8624322f..5d4cf7ab 100644 --- a/iOSExtensions/Directory.Packages.props +++ b/iOSExtensions/Directory.Packages.props @@ -1,12 +1,12 @@ - - true - false - - - - - - - - + + true + false + + + + + + + + \ No newline at end of file