Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update target framework net462 to net472, remove netcoreapp3.1 #73

Merged
merged 4 commits into from
Nov 12, 2024
Merged

Update target framework net462 to net472, remove netcoreapp3.1 #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
66c3779
Update .NET SDK version in global.json to 8.0.400
albertospelta Nov 12, 2024
3eb0608
Update target frameworks `net462` to `net472`, remove `netcoreapp3.1`
albertospelta Nov 12, 2024
ef2f5cc
Update ci.yml
albertospelta Nov 12, 2024
8c2d770
Unpin `xunit.runner.visualstudio` version, bump version 2.8.2
albertospelta Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CI
name: ci
on:
pull_request:
types: [opened, synchronize, reopened, ready_for_review]
Expand All @@ -14,10 +14,9 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
3.1.x
6.0.x
8.0.x
- name: dotnet restore
global-json-file: global.json
- name: restore
run: dotnet restore Dax.Vpax.Obfuscator.CI.slnf
- name: dotnet build
run: dotnet build Dax.Vpax.Obfuscator.CI.slnf --configuration Release --no-restore
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"sdk": {
"version": "8.0.100",
"version": "8.0.400",
"allowPrerelease": false,
"rollForward": "latestFeature"
}
}
}
4 changes: 2 additions & 2 deletions src/Dax.Vpax.Obfuscator.TestApp/Dax.Vpax.Obfuscator.TestApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Dax.Vpax.Obfuscator\Dax.Vpax.Obfuscator.csproj" />
</ItemGroup>

</Project>
</Project>
13 changes: 4 additions & 9 deletions src/Dax.Vpax.Obfuscator/Dax.Vpax.Obfuscator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net462;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
<IsPackable>true</IsPackable>
</PropertyGroup>

Expand Down Expand Up @@ -41,15 +41,10 @@

<!-- Include DLL from project reference in NuGet package -->
<ItemGroup>
<!-- net462 -->
<_PackageFiles Include="$(OutputPath.TrimEnd('\').TrimEnd('/'))_net462\Dax.Tokenizer.dll">
<!-- net472 -->
<_PackageFiles Include="$(OutputPath.TrimEnd('\').TrimEnd('/'))_net472\Dax.Tokenizer.dll">
<BuildAction>None</BuildAction>
<PackagePath>lib\net462\</PackagePath>
</_PackageFiles>
<!-- netcoreapp3.1 -->
<_PackageFiles Include="$(OutputPath.TrimEnd('\').TrimEnd('/'))_netcoreapp3.1\Dax.Tokenizer.dll">
<BuildAction>None</BuildAction>
<PackagePath>lib\netcoreapp3.1\</PackagePath>
<PackagePath>lib\net472\</PackagePath>
</_PackageFiles>
<!-- net6.0 -->
<_PackageFiles Include="$(OutputPath.TrimEnd('\').TrimEnd('/'))_net6.0\Dax.Tokenizer.dll">
Expand Down
2 changes: 1 addition & 1 deletion tests/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>

<PropertyGroup>
<TargetFrameworks>net462;netcoreapp3.1;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
<Nullable>enable</Nullable>
<LangVersion>latest</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>
Expand Down
3 changes: 1 addition & 2 deletions tests/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageVersion Include="xunit" Version="2.9.2" />
<!-- pinned dependencies required to test out-of-support target frameworks -->
<PackageVersion Include="xunit.runner.visualstudio" Version="[2.4.5]" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
</ItemGroup>
</Project>