Skip to content

Commit

Permalink
Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
Witteborn committed Mar 16, 2023
1 parent f2155e2 commit 9f88004
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0

Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

name: Main Workflow

# Controls when the action will run.
# Controls when the action will run.
on:
# Triggers the workflow on push or pull request events but only for the master branch
push:
Expand All @@ -13,7 +13,7 @@ on:
workflow_dispatch:
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:

# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
Expand All @@ -24,27 +24,27 @@ jobs:
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 6.x.x
dotnet-version: 7.x.x

- name: Cake Action
# You may pin to the exact commit or the version.
# uses: cake-build/cake-action@ada1055e59e6ae62905b178090e9636e96e54a35
uses: cake-build/cake-action@v1.4.0
uses: cake-build/cake-action@v1
with:
target: "Build"
target: "Build"

- name: Install GitVersion
uses: gittools/actions/gitversion/setup@v0.9.7
with:
versionSpec: '5.x'

- name: Determine Version
id: gitversion
uses: gittools/actions/gitversion/execute@v0.9.7
Expand Down
10 changes: 5 additions & 5 deletions PineMigration/PineMigration/PineMigration.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<PackAsTool>true</PackAsTool>
Expand All @@ -26,7 +26,7 @@
</PropertyGroup>

<ItemGroup>
<None Include="../../LICENSE.md" Pack="true" PackagePath="LICENSE.md"/>
<None Include="../../LICENSE.md" Pack="true" PackagePath="LICENSE.md" />
</ItemGroup>

<ItemGroup>
Expand All @@ -46,12 +46,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.8.2">
<PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Serilog" Version="2.10.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
<PackageReference Include="Serilog" Version="2.12.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
</ItemGroup>

Expand Down
10 changes: 3 additions & 7 deletions PineMigration/PineMigration/Program.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
using Serilog;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;

namespace PineMigration
Expand All @@ -15,7 +11,6 @@ public static void Main()

try
{

//find and read package config
var packageConfig_content = GetPackageConfigContent();

Expand Down Expand Up @@ -61,6 +56,7 @@ private static string GetPackageConfigContent()
Log.Information("File {@filename} found at {@path}", filename, path);
return File.ReadAllText(path);
}

private static string GetCSProjectFile()
{
var currDir = Directory.GetCurrentDirectory();
Expand All @@ -74,6 +70,7 @@ private static string GetCSProjectFile()

return csproj;
}

private static string[] ConfigToReferences(string packageConfig)
{
const string pattern = "id=\"(.*)\"\\sversion=\"(.*)\"\\stargetFramework";
Expand Down Expand Up @@ -107,6 +104,5 @@ private static string[] GetEnhancedCsProject(string path, string[] itemGroup)
Log.Information("Prepares insert of new ItemGroup at line {@endIndex}", endIndex);
return csprojContent.ToArray();
}

}
}
}
2 changes: 1 addition & 1 deletion build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ var target = Argument("target", "Build");
var configuration = Argument("configuration", "Release");
var solutionName = "PineMigration";
var solutionFolder = "./PineMigration";
var targetFramework = "net6";
var targetFramework = "net7";
var outputFolder = "./artifacts";
var runtime = targetFramework;
var runtimeFolder = outputFolder + $"/{runtime}";
Expand Down

0 comments on commit 9f88004

Please sign in to comment.