Skip to content

Commit

Permalink
Update all microsoft dependencies to v7 (major) (#276)
Browse files Browse the repository at this point in the history
* Update all microsoft dependencies to v7

* Update dotnet-core.yml

* update projects to net7

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: David Vreony <dpvreony@users.noreply.github.com>
  • Loading branch information
renovate[bot] and dpvreony authored Dec 30, 2022
1 parent a35107c commit b73cf3d
Show file tree
Hide file tree
Showing 13 changed files with 26 additions and 36 deletions.
14 changes: 2 additions & 12 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/dotnet-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<LangVersion>9</LangVersion>
<DebugType>full</DebugType>
<DebugSymbols>True</DebugSymbols>
Expand All @@ -16,7 +16,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.12" ReferenceOutputAssembly="true" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.1" ReferenceOutputAssembly="true" />
<PackageReference Include="ReactiveUI.Blazor" Version="18.4.1" ReferenceOutputAssembly="true" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<LangVersion>9</LangVersion>
<DebugType>full</DebugType>
<DebugSymbols>True</DebugSymbols>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.12" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.12" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.1" PrivateAssets="all" />
<PackageReference Include="System.Net.Http.Json" Version="7.0.0" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
<UseWPF>true</UseWPF>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-windows10.0.19041</TargetFramework>
<TargetFramework>net7.0-windows10.0.19041</TargetFramework>
<LangVersion>9</LangVersion>
<DebugType>full</DebugType>
<DebugSymbols>True</DebugSymbols>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
<WindowsSdkPackageVersion>10.0.19041.24</WindowsSdkPackageVersion>
<LangVersion>9</LangVersion>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<LangVersion>9</LangVersion>
<DebugType>full</DebugType>
<DebugSymbols>True</DebugSymbols>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net7.0</TargetFrameworks>
<LangVersion>9</LangVersion>
<DebugType>full</DebugType>
<DebugSymbols>True</DebugSymbols>
Expand Down
2 changes: 1 addition & 1 deletion src/Vetuviem.Benchmarks/Vetuviem.Benchmarks.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<IsPackable>False</IsPackable>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<UseWpf>True</UseWpf>
<IsPackable>False</IsPackable>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Vetuviem.UnitTests/Vetuviem.UnitTests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<IsPackable>False</IsPackable>
</PropertyGroup>

Expand Down

0 comments on commit b73cf3d

Please sign in to comment.