Skip to content

Commit 4c2bced

Browse files
committed
Add net7.0 TFM, remove unsupported netcoreapp3.1
1 parent c80ef7d commit 4c2bced

File tree

5 files changed

+17
-16
lines changed

5 files changed

+17
-16
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ jobs:
1515
matrix:
1616
os: [windows-latest, ubuntu-latest, macos-latest]
1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v3
1919
with:
2020
fetch-depth: 0
2121

22-
- name: Install .NET Core SDK 3.1.x
23-
uses: actions/setup-dotnet@v1
22+
- name: Install .NET SDK 6.0.x
23+
uses: actions/setup-dotnet@v3
2424
with:
25-
dotnet-version: '3.1.x'
25+
dotnet-version: '6.0.x'
2626

2727
- name: Install .NET global.json
28-
uses: actions/setup-dotnet@v1
28+
uses: actions/setup-dotnet@v3
2929

3030
- name: Build KuduSync.NET
3131
run: |
@@ -36,7 +36,7 @@ jobs:
3636
shell: cmd
3737
run: .\BuildNugetPackages.cmd
3838

39-
- uses: actions/upload-artifact@v2
39+
- uses: actions/upload-artifact@v3
4040
if: matrix.os == 'windows-latest'
4141
with:
4242
name: nupkg

BuildNugetPackages.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@echo Off
22
setlocal
33

4-
set netfx="net45"
4+
set netfx="net48"
55
set project=".\KuduSync.NET\KuduSync.NET.csproj"
66
set output=".\artifacts"
77

KuduSync.NET/KuduSync.NET.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks Condition="$(NetFx) == ''">net48;netcoreapp3.1;net6.0</TargetFrameworks>
4+
<TargetFrameworks Condition="$(NetFx) == ''">net48;net6.0;net7.0</TargetFrameworks>
55
<TargetFrameworks Condition="$(NetFx) == 'true'">net48</TargetFrameworks>
6-
<TargetFrameworks Condition="$(NetFx) == 'false'">netcoreapp3.1;net6.0</TargetFrameworks>
6+
<TargetFrameworks Condition="$(NetFx) == 'false'">net6.0;net7.0</TargetFrameworks>
77
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
88
<AssemblyName>KuduSync.NET</AssemblyName>
99
<AssemblyTitle>$(AssemblyName)</AssemblyTitle>
@@ -25,7 +25,7 @@
2525
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
2626
</PropertyGroup>
2727

28-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
28+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net48' ">
2929
<IncludeBuildOutput>false</IncludeBuildOutput>
3030
<NoWarn>NU5128</NoWarn>
3131
<PackageId>$(AssemblyName)</PackageId>
@@ -55,12 +55,12 @@
5555
</PackageReference>
5656
</ItemGroup>
5757

58-
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
58+
<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
5959
<Reference Include="System.Configuration" />
6060
<PackageReference Include="System.IO.Abstractions" Version="7.1.10" PrivateAssets="All" />
6161
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" PrivateAssets="All" Version="1.0.2" />
6262
</ItemGroup>
63-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net6.0'">
63+
<ItemGroup Condition=" '$(TargetFramework)' != 'net48'">
6464
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
6565
<PackageReference Include="System.IO.Abstractions" Version="16.1.4 " />
6666
</ItemGroup>
@@ -69,6 +69,6 @@
6969
<Folder Include="images\" />
7070
<None Include="../kudulogo.png" Link="images\kudulogo.png" Pack="true" PackagePath="/" />
7171
<None Include="../LICENSE.txt" Pack="true" PackagePath="/" />
72-
<None Include="bin/$(Configuration)/$(TargetFramework)/**" Exclude="bin/$(Configuration)/$(TargetFramework)/publish/**" Pack="true" PackagePath="/tools" Condition=" '$(TargetFramework)' == 'net45' " />
72+
<None Include="bin/$(Configuration)/$(TargetFramework)/**" Exclude="bin/$(Configuration)/$(TargetFramework)/publish/**" Pack="true" PackagePath="/tools" Condition=" '$(TargetFramework)' == 'net48' " />
7373
</ItemGroup>
7474
</Project>

global.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"sdk": {
3-
"version": "6.0.101",
4-
"rollForward": "latestFeature"
3+
"version": "7.0.306",
4+
"rollForward": "latestFeature",
5+
"allowPrerelease": false
56
}
67
}

version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "NerdBank.GitVersioning/version.schema.json",
3-
"version": "1.5.4",
3+
"version": "1.5.5",
44
"assemblyVersion": {
55
"precision": "revision"
66
},

0 commit comments

Comments
 (0)