Skip to content

Commit

Permalink
Update to .NET 7 preview 1
Browse files Browse the repository at this point in the history
Update to preview 1 of .NET 7.
  • Loading branch information
martincostello committed Mar 15, 2022
1 parent 8698915 commit 2be0ad0
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
- uses: codecov/codecov-action@v2.1.0
name: Upload coverage to Codecov
with:
file: ./artifacts/coverage.net6.0.cobertura.xml
file: ./artifacts/coverage.net7.0.cobertura.xml
flags: ${{ matrix.os_name }}

- name: Publish artifacts
Expand Down
4 changes: 2 additions & 2 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
<PackageVersion Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
</ItemGroup>
<ItemGroup Condition=" '$(AssemblyName)' != 'JustEat.StatsD' ">
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageVersion Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0-preview.1.22076.8" />
<PackageVersion Update="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0-preview.1.22076.8" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="coverlet.msbuild" PrivateAssets="All" />
Expand Down
2 changes: 1 addition & 1 deletion JustEat.StatsD.ruleset
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<RuleSet Name="JustEat.StatsD Rules" Description="This rule set contains rules for the Just Eat JustEat.StatsD solution." ToolsVersion="16.0">
<RuleSet Name="JustEat.StatsD Rules" Description="This rule set contains rules for the Just Eat JustEat.StatsD solution." ToolsVersion="17.0">
<IncludeAll Action="Warning" />
<Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
<Rule Id="CA1062" Action="None" />
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "6.0.201",
"version": "7.0.100-preview.1.22110.4",
"allowPrerelease": false,
"rollForward": "latestMajor"
}
Expand Down
2 changes: 1 addition & 1 deletion tests/Benchmark/Benchmark.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<NoWarn>$(NoWarn);CA1001;CA1014;CA1822</NoWarn>
<OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
<TargetFrameworks>netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/JustEat.StatsD.Tests/JustEat.StatsD.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<NoWarn>$(NoWarn);CA1014;CA1002;CA1707;CA1711;CA2007</NoWarn>
<RootNamespace>JustEat.StatsD</RootNamespace>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net7.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\JustEat.StatsD\JustEat.StatsD.csproj" />
Expand Down

0 comments on commit 2be0ad0

Please sign in to comment.