Skip to content

Commit

Permalink
Bump actions/setup-dotnet from 2 to 4 (#11)
Browse files Browse the repository at this point in the history
* Bump actions/setup-dotnet from 2 to 4

Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 2 to 4.
- [Release notes](https://github.com/actions/setup-dotnet/releases)
- [Commits](actions/setup-dotnet@v2...v4)

---
updated-dependencies:
- dependency-name: actions/setup-dotnet
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* hopefully fix failing test

* Update main.yml

* Update GlennLibTests.csproj

* Update main.yml

* Update GlennGUI.Mac.csproj

* Update Info.plist

* Update GlennGUI.Mac.csproj

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Miepee <[email protected]>
  • Loading branch information
dependabot[bot] and Miepee authored Jan 2, 2024
1 parent bb22feb commit 0c5d93b
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ jobs:
with:
submodules: true
- name: Setup .NET
uses: actions/setup-dotnet@v2
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
dotnet-version: 8.x.x
- name: Restore dependencies
working-directory: ./GlennCLI
run: dotnet restore
Expand Down Expand Up @@ -80,9 +80,9 @@ jobs:
with:
submodules: true
- name: Setup .NET
uses: actions/setup-dotnet@v2
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
dotnet-version: 8.x.x
- name: Install Mac workload
run: dotnet workload install macos
- name: Restore dependencies
Expand Down Expand Up @@ -111,11 +111,11 @@ jobs:
with:
submodules: true
- name: Setup .NET
uses: actions/setup-dotnet@v2
uses: actions/setup-dotnet@v4
with:
dotnet-version: 6.0.x
dotnet-version: 8.x.x
- name: Install Mac workload
run: dotnet workload install macos
run: dotnet workload install macos && dotnet workload restore
- name: Restore dependencies
working-directory: ./GlennLibTests/
run: dotnet restore
Expand Down
6 changes: 3 additions & 3 deletions GlennGUI/GlennGUI.Mac/GlennGUI.Mac.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0-macos</TargetFramework>
<TargetFramework>net8.0-macos</TargetFramework>
<RollForward>LatestMajor</RollForward>
<RuntimeIdentifiers>osx-x64;osx-arm64</RuntimeIdentifiers>
<SupportedOSPlatformVersion>10.14</SupportedOSPlatformVersion>
<SupportedOSPlatformVersion>10.15</SupportedOSPlatformVersion>
<RuntimeIdentifiers>osx-x64;osx-arm64</RuntimeIdentifiers>

</PropertyGroup>
Expand All @@ -18,4 +18,4 @@
<PackageReference Include="Eto.Platform.macOS" Version="2.8.2" />
</ItemGroup>

</Project>
</Project>
4 changes: 2 additions & 2 deletions GlennGUI/GlennGUI.Mac/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>LSMinimumSystemVersion</key>
<string>10.14</string>
<string>10.15</string>
<key>CFBundleDevelopmentRegion</key>
<string>en</string>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>CFBundleIconFile</key>
<string>Icon.icns</string>
</dict>
</plist>
</plist>
2 changes: 1 addition & 1 deletion GlennLibTests/GlennLibTests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RollForward>LatestMajor</RollForward>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
Expand Down

0 comments on commit 0c5d93b

Please sign in to comment.