diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 04b84846..1665bfd0 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -58,20 +58,10 @@ jobs: $process.Start() $process.WaitForExit() - - name: Setup .NET Core 3.1 + - name: Install .NET 7 uses: actions/setup-dotnet@v3 with: - dotnet-version: 3.1.x - - - name: Setup .NET 5 - uses: actions/setup-dotnet@v3 - with: - dotnet-version: 5.0.x - - - name: Install .NET 6 - uses: actions/setup-dotnet@v3 - with: - dotnet-version: 6.0.x + dotnet-version: 7.0.x - name: Add MSBuild to PATH uses: glennawatson/setup-msbuild@v1.0.3 diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 33831c92..e354e590 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -25,20 +25,20 @@ jobs: with: fetch-depth: 0 - - name: Setup .NET Core 3.1 - uses: actions/setup-dotnet@v3 - with: - dotnet-version: 3.1.x + #- name: Setup .NET Core 3.1 + # uses: actions/setup-dotnet@v3 + # with: + # dotnet-version: 3.1.x - - name: Setup .NET 5 - uses: actions/setup-dotnet@v3 - with: - dotnet-version: 5.0.x + #- name: Setup .NET 5 + # uses: actions/setup-dotnet@v3 + # with: + # dotnet-version: 5.0.x - - name: Setup .NET 6 + - name: Setup .NET 7 uses: actions/setup-dotnet@v3 with: - dotnet-version: 6.0.x + dotnet-version: 7.0.x - name: Install Windows SDK 10.0.16299 shell: pwsh diff --git a/src/ReactiveUI.Blazor.ViewToViewModelBindings/ReactiveUI.Blazor.ViewToViewModelBindings.csproj b/src/ReactiveUI.Blazor.ViewToViewModelBindings/ReactiveUI.Blazor.ViewToViewModelBindings.csproj index 3cc09cbe..0a969941 100644 --- a/src/ReactiveUI.Blazor.ViewToViewModelBindings/ReactiveUI.Blazor.ViewToViewModelBindings.csproj +++ b/src/ReactiveUI.Blazor.ViewToViewModelBindings/ReactiveUI.Blazor.ViewToViewModelBindings.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 9 full True @@ -16,7 +16,7 @@ - + diff --git a/src/ReactiveUI.Maui.ViewToViewModelBindings/ReactiveUI.Maui.ViewToViewModelBindings.csproj b/src/ReactiveUI.Maui.ViewToViewModelBindings/ReactiveUI.Maui.ViewToViewModelBindings.csproj index 4b85a2d8..57270870 100644 --- a/src/ReactiveUI.Maui.ViewToViewModelBindings/ReactiveUI.Maui.ViewToViewModelBindings.csproj +++ b/src/ReactiveUI.Maui.ViewToViewModelBindings/ReactiveUI.Maui.ViewToViewModelBindings.csproj @@ -1,6 +1,6 @@ - net6.0 + net7.0 9 full True diff --git a/src/ReactiveUI.VetuviemSample.BlazorApp/ReactiveUI.VetuviemSample.BlazorApp.csproj b/src/ReactiveUI.VetuviemSample.BlazorApp/ReactiveUI.VetuviemSample.BlazorApp.csproj index c229f3c3..d87b4a1b 100644 --- a/src/ReactiveUI.VetuviemSample.BlazorApp/ReactiveUI.VetuviemSample.BlazorApp.csproj +++ b/src/ReactiveUI.VetuviemSample.BlazorApp/ReactiveUI.VetuviemSample.BlazorApp.csproj @@ -1,12 +1,12 @@ - net6.0 + net7.0 - - + + diff --git a/src/ReactiveUI.WPF.SampleApp/ReactiveUI.WPF.SampleApp.csproj b/src/ReactiveUI.WPF.SampleApp/ReactiveUI.WPF.SampleApp.csproj index 2d852120..8fffe39d 100644 --- a/src/ReactiveUI.WPF.SampleApp/ReactiveUI.WPF.SampleApp.csproj +++ b/src/ReactiveUI.WPF.SampleApp/ReactiveUI.WPF.SampleApp.csproj @@ -2,7 +2,7 @@ WinExe - net6.0-windows10.0.19041.0 + net7.0-windows10.0.19041.0 true diff --git a/src/ReactiveUI.WPF.ViewToViewModelBindings/ReactiveUI.WPF.ViewToViewModelBindings.csproj b/src/ReactiveUI.WPF.ViewToViewModelBindings/ReactiveUI.WPF.ViewToViewModelBindings.csproj index 078f67ac..50ae778b 100644 --- a/src/ReactiveUI.WPF.ViewToViewModelBindings/ReactiveUI.WPF.ViewToViewModelBindings.csproj +++ b/src/ReactiveUI.WPF.ViewToViewModelBindings/ReactiveUI.WPF.ViewToViewModelBindings.csproj @@ -1,6 +1,6 @@  - net6.0-windows10.0.19041 + net7.0-windows10.0.19041 9 full True diff --git a/src/ReactiveUI.WinUI3.ViewToViewModelBindings/ReactiveUI.WinUI3.ViewToViewModelBindings.csproj b/src/ReactiveUI.WinUI3.ViewToViewModelBindings/ReactiveUI.WinUI3.ViewToViewModelBindings.csproj index c5fcb55b..e6c07af8 100644 --- a/src/ReactiveUI.WinUI3.ViewToViewModelBindings/ReactiveUI.WinUI3.ViewToViewModelBindings.csproj +++ b/src/ReactiveUI.WinUI3.ViewToViewModelBindings/ReactiveUI.WinUI3.ViewToViewModelBindings.csproj @@ -1,7 +1,7 @@ - net6.0-windows10.0.19041.0 + net7.0-windows10.0.19041.0 10.0.17763.0 10.0.19041.24 9 diff --git a/src/ReactiveUI.Winforms.ViewToViewModelBindings/ReactiveUI.Winforms.ViewToViewModelBindings.csproj b/src/ReactiveUI.Winforms.ViewToViewModelBindings/ReactiveUI.Winforms.ViewToViewModelBindings.csproj index 21275ff4..35d29914 100644 --- a/src/ReactiveUI.Winforms.ViewToViewModelBindings/ReactiveUI.Winforms.ViewToViewModelBindings.csproj +++ b/src/ReactiveUI.Winforms.ViewToViewModelBindings/ReactiveUI.Winforms.ViewToViewModelBindings.csproj @@ -1,7 +1,7 @@  - net6.0-windows + net7.0-windows 9 full True diff --git a/src/ReactiveUI.XamForms.ViewToViewModelBindings/ReactiveUI.XamForms.ViewToViewModelBindings.csproj b/src/ReactiveUI.XamForms.ViewToViewModelBindings/ReactiveUI.XamForms.ViewToViewModelBindings.csproj index c188573b..fa8e882a 100644 --- a/src/ReactiveUI.XamForms.ViewToViewModelBindings/ReactiveUI.XamForms.ViewToViewModelBindings.csproj +++ b/src/ReactiveUI.XamForms.ViewToViewModelBindings/ReactiveUI.XamForms.ViewToViewModelBindings.csproj @@ -1,7 +1,7 @@ - netstandard2.0;net6.0 + netstandard2.0;net7.0 9 full True diff --git a/src/Vetuviem.Benchmarks/Vetuviem.Benchmarks.csproj b/src/Vetuviem.Benchmarks/Vetuviem.Benchmarks.csproj index 0b4e2ba7..57255bbe 100644 --- a/src/Vetuviem.Benchmarks/Vetuviem.Benchmarks.csproj +++ b/src/Vetuviem.Benchmarks/Vetuviem.Benchmarks.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 False diff --git a/src/Vetuviem.IntegrationTests/Vetuviem.IntegrationTests.csproj b/src/Vetuviem.IntegrationTests/Vetuviem.IntegrationTests.csproj index ac1319ac..b221490e 100644 --- a/src/Vetuviem.IntegrationTests/Vetuviem.IntegrationTests.csproj +++ b/src/Vetuviem.IntegrationTests/Vetuviem.IntegrationTests.csproj @@ -1,7 +1,7 @@  - net6.0-windows + net7.0-windows True False diff --git a/src/Vetuviem.UnitTests/Vetuviem.UnitTests.csproj b/src/Vetuviem.UnitTests/Vetuviem.UnitTests.csproj index 56e8ec99..15015c03 100644 --- a/src/Vetuviem.UnitTests/Vetuviem.UnitTests.csproj +++ b/src/Vetuviem.UnitTests/Vetuviem.UnitTests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 False