Skip to content

Commit

Permalink
(feat): bump to net6 (#37)
Browse files Browse the repository at this point in the history
* (feat): bump to net6
NikiforovAll authored Apr 5, 2022
1 parent b75ea7c commit c65aa8a
Showing 17 changed files with 22 additions and 20 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -34,8 +34,10 @@ jobs:
- name: 'Git Fetch Tags'
run: git fetch --tags
shell: pwsh
- name: 'Install .NET Core SDK'
- name: 'Install .NET SDK'
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.0.100
- name: 'Dotnet Tool Restore'
run: dotnet tool restore
shell: pwsh
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -20,8 +20,8 @@
</PropertyGroup>

<ItemGroup Label="Package References">
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" PrivateAssets="all" Version="16.8.55" />
<PackageReference Include="MinVer" PrivateAssets="all" Version="2.3.1" />
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" PrivateAssets="all" Version="17.1.46" />
<PackageReference Include="MinVer" PrivateAssets="all" Version="3.1.0" />
<PackageReference Include="StyleCop.Analyzers" PrivateAssets="all" Version="1.1.118" />
</ItemGroup>

2 changes: 1 addition & 1 deletion Source/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@
</PropertyGroup>

<ItemGroup Label="Package References">
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="all" Version="1.0.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="all" Version="1.1.1" />
<PackageReference Include="Spectre.Console" Version="0.32.*" />
</ItemGroup>

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

<PropertyGroup Label="Build">
<TargetFrameworks>net5.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>

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

<PropertyGroup Label="Build">
<TargetFrameworks>net5.0;netstandard2.1</TargetFrameworks>
<TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
<Nullable>enable</Nullable>
</PropertyGroup>

Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
</ItemGroup>

<PropertyGroup Label="Build">
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
</PropertyGroup>

4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"rollForward": "latestMajor",
"version": "5.0.100"
"rollForward": "latestMinor",
"version": "6.0.100"
}
}
2 changes: 1 addition & 1 deletion samples/DataSet/DataSet.csproj
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

2 changes: 1 addition & 1 deletion samples/DataTable/DataTable.csproj
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

4 changes: 2 additions & 2 deletions samples/DataTableEfCore/.vscode/launch.json
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/bin/Debug/net5.0/DataTableEfCore.dll",
"program": "${workspaceFolder}/bin/Debug/net6.0/DataTableEfCore.dll",
"args": [],
"cwd": "${workspaceFolder}",
"console": "internalConsole",
@@ -22,4 +22,4 @@
"processId": "${command:pickProcess}"
}
]
}
}
2 changes: 1 addition & 1 deletion samples/DataTableEfCore/DataTableEfCore.csproj
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
<Nullable>enable</Nullable>
<AnalysisLevel>latest</AnalysisLevel>
2 changes: 1 addition & 1 deletion samples/http-progress/.vscode/launch.json
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/bin/Debug/net5.0/HttpProgress.dll",
"program": "${workspaceFolder}/bin/Debug/net6.0/HttpProgress.dll",
"args": [],
"cwd": "${workspaceFolder}",
"console": "externalTerminal",
2 changes: 1 addition & 1 deletion samples/http-progress/HttpProgress.csproj
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
<ItemGroup>
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/bin/Debug/net5.0/IProgress.dll",
"program": "${workspaceFolder}/bin/Debug/net6.0/IProgress.dll",
"args": [],
"cwd": "${workspaceFolder}",
"console": "externalTerminal",
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>SA1600;CS1591</NoWarn>
</PropertyGroup>
2 changes: 1 addition & 1 deletion samples/iprogress/.vscode/launch.json
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/bin/Debug/net5.0/IProgress.dll",
"program": "${workspaceFolder}/bin/Debug/net6.0/IProgress.dll",
"args": [],
"cwd": "${workspaceFolder}",
"console": "externalTerminal",
2 changes: 1 addition & 1 deletion samples/iprogress/IProgress.csproj
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
<ItemGroup>

0 comments on commit c65aa8a

Please sign in to comment.