From 6161a2ca0be1d4a7fe0f783167c30531fa00d80f Mon Sep 17 00:00:00 2001 From: "Brett V. Forsgren" Date: Fri, 30 Aug 2024 10:57:57 -0600 Subject: [PATCH] update SDK and TFMs --- .github/workflows/ci.yml | 6 ++---- .vscode/tasks.json | 15 ++++++++++----- global.json | 6 ++++++ src/IxMilia.Step.Test/IxMilia.Step.Test.csproj | 12 ++++-------- src/IxMilia.Step/IxMilia.Step.csproj | 8 ++------ src/IxMilia.Step/StepFile.cs | 4 ---- 6 files changed, 24 insertions(+), 27 deletions(-) create mode 100644 global.json diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f59b6d0..739b2e9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,10 +11,8 @@ jobs: os: [ubuntu-latest, windows-latest] configuration: [Debug, Release] steps: - - uses: actions/checkout@v1 - - uses: actions/setup-dotnet@v1 - with: - dotnet-version: '3.1.201' + - uses: actions/checkout@v4 + - uses: actions/setup-dotnet@v4 - name: Build and test shell: pwsh run: | diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 4bde8f7..a7a3b2b 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -1,16 +1,21 @@ { - "version": "0.1.0", + "version": "2.0.0", "command": "dotnet", - "isShellCommand": true, "args": [], "tasks": [ { - "taskName": "build", + "label": "build", + "type": "shell", + "command": "dotnet", "args": [ + "build", "${workspaceRoot}/src/IxMilia.Step.Test/IxMilia.Step.Test.csproj" ], - "isBuildCommand": true, - "problemMatcher": "$msCompile" + "problemMatcher": "$msCompile", + "group": { + "_id": "build", + "isDefault": false + } } ] } \ No newline at end of file diff --git a/global.json b/global.json new file mode 100644 index 0000000..8d0a1c0 --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "version": "8.0.300", + "rollForward": "latestMinor" + } +} \ No newline at end of file diff --git a/src/IxMilia.Step.Test/IxMilia.Step.Test.csproj b/src/IxMilia.Step.Test/IxMilia.Step.Test.csproj index b535fea..7138ef0 100644 --- a/src/IxMilia.Step.Test/IxMilia.Step.Test.csproj +++ b/src/IxMilia.Step.Test/IxMilia.Step.Test.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net8.0 @@ -10,13 +10,9 @@ - - - - - - - + + + diff --git a/src/IxMilia.Step/IxMilia.Step.csproj b/src/IxMilia.Step/IxMilia.Step.csproj index 231a824..e85e663 100644 --- a/src/IxMilia.Step/IxMilia.Step.csproj +++ b/src/IxMilia.Step/IxMilia.Step.csproj @@ -5,7 +5,7 @@ Copyright 2017 IxMilia.Step IxMilia - netstandard1.0;netstandard1.3 + netstandard2.0 IxMilia.Step IxMilia.Step CAD;STEP;STP @@ -18,12 +18,8 @@ $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb - - $(DefineConstants);HAS_FILESYSTEM_ACCESS - - - + diff --git a/src/IxMilia.Step/StepFile.cs b/src/IxMilia.Step/StepFile.cs index 31432b4..9c98425 100644 --- a/src/IxMilia.Step/StepFile.cs +++ b/src/IxMilia.Step/StepFile.cs @@ -46,7 +46,6 @@ public StepFile() Items = new List(); } -#if HAS_FILESYSTEM_ACCESS public static StepFile Load(string path) { using (var stream = new FileStream(path, FileMode.Open)) @@ -54,7 +53,6 @@ public static StepFile Load(string path) return Load(stream); } } -#endif public static StepFile Load(Stream stream) { @@ -79,7 +77,6 @@ public string GetContentsAsString(bool inlineReferences = false) return writer.GetContents(); } -#if HAS_FILESYSTEM_ACCESS public void Save(string path, bool inlineReferences = false) { using (var stream = new FileStream(path, FileMode.Create)) @@ -87,7 +84,6 @@ public void Save(string path, bool inlineReferences = false) Save(stream, inlineReferences); } } -#endif public void Save(Stream stream, bool inlineReferences = false) {