Skip to content

Target .net 10 #28

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

Merged
mv3shape merged 5 commits into from
Feb 24, 2026
Merged

Target .net 10 #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5c14701
Target .net 10
mv3shape Jan 14, 2026
1f4f2b4
Revert "Target .net 10"
mv3shape Jan 14, 2026
a1bef0c
Update readme
mv3shape Jan 15, 2026
7d8846d
Reapply "Target .net 10"
mv3shape Jan 15, 2026
5f9a782
Update nuspec
mv3shape Jan 15, 2026
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
2 changes: 1 addition & 1 deletion Console/Obfuscar.Console.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<ProjectGuid>{275B3EED-7E70-4460-950F-96EDCA099BD4}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>Obfuscar</RootNamespace>
<TargetFramework>net8.0-windows</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<FileUpgradeFlags />
<UpgradeBackupLocation />
<PublishUrl>publish\</PublishUrl>
Expand Down
2 changes: 1 addition & 1 deletion GlobalTools/GlobalTools.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0-windows;net8.0-windows</TargetFrameworks>
<TargetFrameworks>net10.0-windows</TargetFrameworks>

<PackAsTool>true</PackAsTool>
<ToolCommandName>obfuscar.console</ToolCommandName>
Expand Down
2 changes: 1 addition & 1 deletion Obfuscar.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@
<files>
<!-- Include everything in \build -->
<file src="build\**" target="build" />
<file src="bin\release\net8.0-windows\win-x64\*.*" target="tools" />
<file src="bin\release\net10.0-windows\win-x64\*.*" target="tools" />
</files>
</package>
1 change: 1 addition & 0 deletions Obfuscar/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ public static AssemblyInfo FromXml(Project project, XElement reader, Variables v
string val = Helper.GetAttribute(reader, "file", vars);
if (val.Length > 0)
{
Console.WriteLine("Loading " + val);
info.LoadAssembly(val);
}
else
Expand Down
10 changes: 3 additions & 7 deletions Obfuscar/Obfuscar.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>net6.0;net8.0;net48</TargetFrameworks>
<TargetFrameworks>net10.0;net48</TargetFrameworks>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
<AnalysisMode>Minimum</AnalysisMode>
Expand All @@ -26,12 +26,8 @@
<PackageReference Include="System.Runtime.Caching" Version="4.5.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="System.Runtime.Caching" Version="6.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="System.Runtime.Caching" Version="8.0.0" />
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageReference Include="System.Runtime.Caching" Version="10.0.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion ObfuscarTest.FluentAssertions/ObfuscarTest.FluentAssertions.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>net6.0;net8.0;net48</TargetFrameworks>
<TargetFrameworks>net10.0;net48</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ObfuscarTestNet/ObfuscarTestNet.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>net6.0;net8.0;net48</TargetFrameworks>
<TargetFrameworks>net10.0;net48</TargetFrameworks>
<IsPackable>false</IsPackable>
<IsTestProject>true</IsTestProject>
<LangVersion>latest</LangVersion>
Expand Down
3 changes: 1 addition & 2 deletions readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,4 @@ If you want to donate to my efforts on this project, please use the following li

/Master - Not to be changed in 3Shape - should be kept in sync with the fork origin.

Build Link: https://github.com/3shape/obfuscar/actions
Release link: https://github.com/3ShapeInternal/ThreeShape.Obfuscar.Release
To release the nuget, please see this repo: https://github.com/3ShapeInternal/ThreeShape.Obfuscar.Release