Skip to content

Commit 6f27244

Browse files
authored
Merge pull request #21 from nblumhardt/net7.0-updates
Update to .NET 7 target and tooling; major version bump
2 parents 84e6b4f + 03dacea commit 6f27244

File tree

5 files changed

+18
-11
lines changed

5 files changed

+18
-11
lines changed

appveyor.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@ version: '{build}'
22
skip_tags: true
33
image: Visual Studio 2022
44
test: off
5+
install:
6+
- ps: $RequiredDotnetVersion = $(Get-Content ./global.json | ConvertFrom-Json).sdk.version
7+
- ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetsdk"
8+
- ps: mkdir $env:DOTNET_INSTALL_DIR -Force | Out-Null
9+
- ps: Invoke-WebRequest -Uri "https://dot.net/v1/dotnet-install.ps1" -OutFile "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1"
10+
- ps: '& "$($env:DOTNET_INSTALL_DIR)/dotnet-install.ps1" -Version $RequiredDotnetVersion -InstallDir $env:DOTNET_INSTALL_DIR'
11+
- ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
512
build_script:
613
- ps: ./Build.ps1
714
artifacts:

example/ExampleClient/ExampleClient.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.0-rc.1.*" />
9-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.0-rc.1.*" />
10-
<PackageReference Include="System.Net.Http.Json" Version="5.0.0-rc.1.*" />
8+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
9+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" />
10+
<PackageReference Include="System.Net.Http.Json" Version="7.0.0" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "6.0.101",
3+
"version": "7.0.100",
44
"rollForward": "latestFeature"
55
}
66
}

src/Serilog.Sinks.BrowserConsole/Serilog.Sinks.BrowserConsole.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
5-
<VersionPrefix>1.0.1</VersionPrefix>
4+
<TargetFramework>net7.0</TargetFramework>
5+
<VersionPrefix>2.0.0</VersionPrefix>
66
<RootNamespace>Serilog</RootNamespace>
77
<Description>Simple .NET logging with fully-structured events</Description>
88
<Authors>Serilog Contributors</Authors>
@@ -19,7 +19,7 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.0" />
22+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
2323
<PackageReference Include="Serilog" Version="2.10.0" />
2424
</ItemGroup>
2525

test/Serilog.Sinks.BrowserConsole.Tests/Serilog.Sinks.BrowserConsole.Tests.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
11-
<PackageReference Include="xunit" Version="2.3.1" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
11+
<PackageReference Include="xunit" Version="2.4.2" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

0 commit comments

Comments
 (0)