Skip to content

Commit

Permalink
update SDK and TFMs
Browse files Browse the repository at this point in the history
  • Loading branch information
brettfo committed Aug 30, 2024
1 parent 6f0e6bd commit 532cc72
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build-generator",
"program": "${workspaceFolder}/artifacts/bin/IxMilia.Dxf.Generator/Debug/net7.0/IxMilia.Dxf.Generator.dll",
"program": "${workspaceFolder}/artifacts/bin/IxMilia.Dxf.Generator/Debug/net8.0/IxMilia.Dxf.Generator.dll",
"args": [
"${workspaceFolder}/src/IxMilia.Dxf/Generated"
],
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ Support for DXF files is complete from versions R10 through R2014 _EXCEPT_ for t

## Building locally

To build locally, install the [latest .NET 5.0 SDK](https://dotnet.microsoft.com/download).
To build locally, install the [latest .NET 8.0 SDK](https://dotnet.microsoft.com/download).

## DXF Reference

Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "7.0.100",
"version": "8.0.100",
"rollForward": "latestMinor"
}
}
8 changes: 4 additions & 4 deletions src/Examples/Examples.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 All @@ -11,9 +11,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
</ItemGroup>

</Project>
3 changes: 1 addition & 2 deletions src/IxMilia.Dxf.Generator/IxMilia.Dxf.Generator.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>
<LangVersion>preview</LangVersion>
<IsPackable>false</IsPackable>
</PropertyGroup>
Expand All @@ -16,4 +16,3 @@
</ItemGroup>

</Project>

17 changes: 10 additions & 7 deletions src/IxMilia.Dxf.Integration.Test/AutoCadExistsFactAttribute.cs
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,24 @@ private static string GetPathToAutoCad(bool throwOnError)
_pathResolved = true;
var programFiles = Environment.GetEnvironmentVariable("ProgramFiles(x86)") ??
Environment.GetEnvironmentVariable("ProgramFiles");
if (programFiles.EndsWith(" (x86)"))
if (programFiles?.EndsWith(" (x86)") == true)
{
// hack when running in VS
programFiles = programFiles.Substring(0, programFiles.Length - 6);
}

var autodesk = Path.Combine(programFiles, "Autodesk");
if (Directory.Exists(autodesk))
if (programFiles is not null)
{
foreach (var candidateDir in Directory.EnumerateDirectories(autodesk, "AutoCAD*"))
var autodesk = Path.Combine(programFiles, "Autodesk");
if (Directory.Exists(autodesk))
{
var candidatePath = Path.Combine(candidateDir, _converterExe);
if (File.Exists(candidatePath))
foreach (var candidateDir in Directory.EnumerateDirectories(autodesk, "AutoCAD*"))
{
_converterPath = candidatePath;
var candidatePath = Path.Combine(candidateDir, _converterExe);
if (File.Exists(candidatePath))
{
_converterPath = candidatePath;
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

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

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

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
</ItemGroup>

</Project>
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>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
8 changes: 4 additions & 4 deletions src/IxMilia.Dxf.Test/IxMilia.Dxf.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@

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

<ItemGroup>
<ProjectReference Include="..\IxMilia.Dxf\IxMilia.Dxf.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="xunit" Version="2.9.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit 532cc72

Please sign in to comment.