Skip to content

Commit

Permalink
Target net60
Browse files Browse the repository at this point in the history
  • Loading branch information
dustinsoftware committed Mar 23, 2022
1 parent b743c51 commit 4037beb
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Project2015To2017.Core/PathCompat.NETCore.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace Project2015To2017
{
public static partial class PathCompat
{
#if NETCOREAPP2_1
#if NET6_0
/// <summary>
/// Create a relative path from one path to another. Paths will be resolved before calculating the difference.
/// Default path comparison for the active platform will be used (OrdinalIgnoreCase for Windows or Mac, Ordinal for Unix).
Expand Down
2 changes: 1 addition & 1 deletion Project2015To2017.Core/Project2015To2017.Core.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net461;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net461;net6.0</TargetFrameworks>
<RootNamespace>Project2015To2017</RootNamespace>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks Condition="$(Pack) != 'true'">net461;netcoreapp2.1</TargetFrameworks>
<TargetFramework Condition="$(Pack) == 'true'">netcoreapp2.1</TargetFramework>
<TargetFrameworks Condition="$(Pack) != 'true'">net461;net6.0</TargetFrameworks>
<TargetFramework Condition="$(Pack) == 'true'">net6.0</TargetFramework>
<PackAsTool Condition="$(Pack) == 'true'">True</PackAsTool>

<AssemblyName>dotnet-migrate-2017</AssemblyName>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks Condition="$(Pack) != 'true'">net461;netcoreapp2.1</TargetFrameworks>
<TargetFramework Condition="$(Pack) == 'true'">netcoreapp2.1</TargetFramework>
<TargetFrameworks Condition="$(Pack) != 'true'">net461;net6.0</TargetFrameworks>
<TargetFramework Condition="$(Pack) == 'true'">net6.0</TargetFramework>
<PackAsTool Condition="$(Pack) == 'true'">True</PackAsTool>

<AssemblyName>dotnet-migrate-2019</AssemblyName>
Expand Down
2 changes: 1 addition & 1 deletion Project2015To2017.Tests/Project2015To2017.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ build_script:
- cmd: dotnet --version
- cmd: dotnet pack %LIBRARY% %LOGGER% -v m -c %configuration% --force /p:Pack=true
- cmd: dotnet pack %CLITOOL2017% %LOGGER% -v m -c %configuration% --force /p:Pack=true
- cmd: dotnet publish %CLITOOL2017% %LOGGER% -v m -c %configuration% -f netcoreapp2.1 -o ./out2017/netcoreapp2.1
- cmd: dotnet publish %CLITOOL2017% %LOGGER% -v m -c %configuration% -f net6.0 -o ./out2017/net6.0
- cmd: dotnet publish %CLITOOL2017% %LOGGER% -v m -c %configuration% -f net461 -o ./out2017/net461
- cmd: dotnet pack %CLITOOL2019% %LOGGER% -v m -c %configuration% --force /p:Pack=true
- cmd: dotnet publish %CLITOOL2019% %LOGGER% -v m -c %configuration% -f netcoreapp2.1 -o ./out2019/netcoreapp2.1
- cmd: dotnet publish %CLITOOL2019% %LOGGER% -v m -c %configuration% -f net6.0 -o ./out2019/net6.0
- cmd: dotnet publish %CLITOOL2019% %LOGGER% -v m -c %configuration% -f net461 -o ./out2019/net461
after_build:
- cmd: 7z a ./dotnet-migrate-2017.zip ./out2017/*
Expand Down

0 comments on commit 4037beb

Please sign in to comment.