Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/nuget/System.Management.Automatio…
Browse files Browse the repository at this point in the history
…n-7.3.11
  • Loading branch information
NeilMacMullen authored Feb 11, 2024
2 parents 4ff1bfa + 680fb6c commit 6932889
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x

2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x
- name: Restore
run: dotnet restore
- name: Test
Expand Down
2 changes: 1 addition & 1 deletion Core/Core.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

</Project>
6 changes: 3 additions & 3 deletions DriveProvider/DriveProvider.csproj
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Management.Automation" Version="7.3.11" />
<PackageReference Include="System.Management.Automation" Version="7.4.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Core\Core.csproj" />
Expand Down
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,9 @@
If you like, or are using this project please give it a star - thanks!
<hr/>


## What's new?
### v1.4.0 (Mar 2023)
- migrate to Net7
- slightly less intrusive version checking
### v1.5.0 (Feb 2024)
- migrate to Net8

See [full revision history](doc/revisionHistory.md)
<hr/>
Expand Down
6 changes: 3 additions & 3 deletions Tests/Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>

<IsPackable>false</IsPackable>
</PropertyGroup>
Expand All @@ -10,7 +10,7 @@
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="nunit" Version="4.0.1" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 6 additions & 0 deletions doc/changelist.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
[
{
"Version": "1.5.0",
"Date": "2024-02-11",
"Summary": "Upgrade to .Net 8",
"Detail": []
},
{
"Version": "1.4.0",
"Date": "2022-03-25",
Expand Down
3 changes: 3 additions & 0 deletions doc/revisionHistory.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Change log

### v1.5.0
- Migrate to Net8

### v1.4.0
- Migrate to Net7
- Make version checking less intrusive by only checking on 1 in 10 startups
Expand Down
2 changes: 1 addition & 1 deletion jumpfs/Commands/GitVersionInformation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
{
public static class GitVersionInformation
{
public const string SemVer = "1.4.0";
public const string SemVer = "1.5.0";
}
}
2 changes: 1 addition & 1 deletion jumpfs/jumpfs.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down

0 comments on commit 6932889

Please sign in to comment.