From 76c82ad03bd4c1088fed3a0a98a27d8fceb411bd Mon Sep 17 00:00:00 2001 From: Chris Yeninas <844685+PhantomGamers@users.noreply.github.com> Date: Mon, 20 Nov 2023 22:58:06 -0500 Subject: [PATCH 1/5] Revert "temp disable locked mode" This reverts commit b502e6d57a9e391779a5227378a37e856a8a044b. --- .github/workflows/build.yml | 1 + .github/workflows/publish.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3ff443f..fc1d922 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,6 +27,7 @@ jobs: dotnet-version: 7.x cache: true cache-dependency-path: '**/packages.lock.json' + - run: dotnet restore --locked-mode - name: Set OS_ARG environment variable run: | if ("${{ runner.os }}" -eq "Windows") { diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 4e62a6e..e6822ce 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -53,6 +53,7 @@ jobs: dotnet-version: 7.x cache: true cache-dependency-path: '**/packages.lock.json' + - run: dotnet restore --locked-mode - name: Set OS_ARG environment variable run: | if ("${{ runner.os }}" -eq "Windows") { From 74bbf4ac1556e0d21ef09b215fc65d47588f32e7 Mon Sep 17 00:00:00 2001 From: Chris Yeninas <844685+PhantomGamers@users.noreply.github.com> Date: Tue, 21 Nov 2023 02:31:29 -0500 Subject: [PATCH 2/5] update package locks --- SFP_UI/packages.lock.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/SFP_UI/packages.lock.json b/SFP_UI/packages.lock.json index 026b464..cd157b4 100644 --- a/SFP_UI/packages.lock.json +++ b/SFP_UI/packages.lock.json @@ -79,6 +79,18 @@ "MicroCom.Runtime": "0.11.0" } }, + "Microsoft.NET.ILLink.Analyzers": { + "type": "Direct", + "requested": "[7.0.100-1.23211.1, )", + "resolved": "7.0.100-1.23211.1", + "contentHash": "0GvbEgDGcUQA9KuWcQU1WwYHXt1tBzNr1Nls/M57rM7NA/AndFwCaCEoJpJkmxRY7xLlPDBnmGp8h5+FNqUngg==" + }, + "Microsoft.NET.ILLink.Tasks": { + "type": "Direct", + "requested": "[7.0.100-1.23211.1, )", + "resolved": "7.0.100-1.23211.1", + "contentHash": "tvG8XZYLjT0o3WicCyKBZysVWo1jC9HdCFmNRmddx3WbAz0UCsd0qKZqpiEo99VLA8Re+FzWK51OcRldQPbt2Q==" + }, "MinVer": { "type": "Direct", "requested": "[4.3.0, )", From 0668188f19f9822e226a3d151c49fba8236efd54 Mon Sep 17 00:00:00 2001 From: Chris Yeninas <844685+PhantomGamers@users.noreply.github.com> Date: Tue, 21 Nov 2023 02:40:32 -0500 Subject: [PATCH 3/5] Create global.json --- global.json | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 global.json diff --git a/global.json b/global.json new file mode 100644 index 0000000..37704f0 --- /dev/null +++ b/global.json @@ -0,0 +1,7 @@ +{ + "sdk": { + "version": "7.0.0", + "rollForward": "latestMajor", + "allowPrerelease": true + } +} From 452b0deade2eda0cefd9c348bdc325ce04f89ddc Mon Sep 17 00:00:00 2001 From: Chris Yeninas <844685+PhantomGamers@users.noreply.github.com> Date: Tue, 21 Nov 2023 02:52:51 -0500 Subject: [PATCH 4/5] prevent compilation with net8 sdk --- SFP.sln | 1 + global.json | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/SFP.sln b/SFP.sln index c21eda1..3102007 100644 --- a/SFP.sln +++ b/SFP.sln @@ -14,6 +14,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution README.md = README.md createpublishedzip.ps1 = createpublishedzip.ps1 .pre-commit-config.yaml = .pre-commit-config.yaml + global.json = global.json EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{D50C3657-84AF-4631-9291-21EEF38F94B6}" diff --git a/global.json b/global.json index 37704f0..3cb4f96 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { "version": "7.0.0", - "rollForward": "latestMajor", - "allowPrerelease": true + "rollForward": "latestMinor", + "allowPrerelease": false } } From 02b33565d3dd3693149fac4200402e14c1a698c0 Mon Sep 17 00:00:00 2001 From: Chris Yeninas <844685+PhantomGamers@users.noreply.github.com> Date: Tue, 21 Nov 2023 02:53:42 -0500 Subject: [PATCH 5/5] update packages lock --- SFP_UI/packages.lock.json | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/SFP_UI/packages.lock.json b/SFP_UI/packages.lock.json index cd157b4..026b464 100644 --- a/SFP_UI/packages.lock.json +++ b/SFP_UI/packages.lock.json @@ -79,18 +79,6 @@ "MicroCom.Runtime": "0.11.0" } }, - "Microsoft.NET.ILLink.Analyzers": { - "type": "Direct", - "requested": "[7.0.100-1.23211.1, )", - "resolved": "7.0.100-1.23211.1", - "contentHash": "0GvbEgDGcUQA9KuWcQU1WwYHXt1tBzNr1Nls/M57rM7NA/AndFwCaCEoJpJkmxRY7xLlPDBnmGp8h5+FNqUngg==" - }, - "Microsoft.NET.ILLink.Tasks": { - "type": "Direct", - "requested": "[7.0.100-1.23211.1, )", - "resolved": "7.0.100-1.23211.1", - "contentHash": "tvG8XZYLjT0o3WicCyKBZysVWo1jC9HdCFmNRmddx3WbAz0UCsd0qKZqpiEo99VLA8Re+FzWK51OcRldQPbt2Q==" - }, "MinVer": { "type": "Direct", "requested": "[4.3.0, )",