From de34d20defca183f7a97d4053eb8bc775eba6825 Mon Sep 17 00:00:00 2001 From: pizzaboxer Date: Sun, 23 Jul 2023 23:28:57 +0100 Subject: [PATCH] Actions: use lockfile for packages forgot about this --- .github/workflows/ci.yml | 2 +- Bloxstrap/Bloxstrap.csproj | 1 + Bloxstrap/packages.lock.json | 92 ++++++++++++++++++++++++++++++++++++ wpfui | 2 +- 4 files changed, 95 insertions(+), 2 deletions(-) create mode 100644 Bloxstrap/packages.lock.json diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dfb1ea3..440f81a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: run: dotnet build --no-restore - name: Publish - run: dotnet publish -p:PublishSingleFile=true -p:CommitHash=${{ github.sha }} -p:CommitRef=${{ github.ref_type }}/${{ github.ref_name }} -r win-x64 -c ${{ matrix.configuration }} --self-contained false .\Bloxstrap\Bloxstrap.csproj + run: dotnet publish -p:PublishSingleFile=true -p:CommitHash=${{ github.sha }} -p:CommitRef=${{ github.ref_type }}/${{ github.ref_name }} -r win-x64 -c ${{ matrix.configuration }} --self-contained false --locked-mode .\Bloxstrap\Bloxstrap.csproj - name: Upload Artifact uses: actions/upload-artifact@v3 diff --git a/Bloxstrap/Bloxstrap.csproj b/Bloxstrap/Bloxstrap.csproj index 8d27456..73f8d1d 100644 --- a/Bloxstrap/Bloxstrap.csproj +++ b/Bloxstrap/Bloxstrap.csproj @@ -10,6 +10,7 @@ 2.4.0 2.4.0.0 app.manifest + true diff --git a/Bloxstrap/packages.lock.json b/Bloxstrap/packages.lock.json new file mode 100644 index 0000000..16da69d --- /dev/null +++ b/Bloxstrap/packages.lock.json @@ -0,0 +1,92 @@ +{ + "version": 1, + "dependencies": { + "net6.0-windows7.0": { + "CommunityToolkit.Mvvm": { + "type": "Direct", + "requested": "[8.2.1, )", + "resolved": "8.2.1", + "contentHash": "I24ofWVEdplxYjUez9/bljv/qb8r8Ccj6cvYXHexNBegLaD3iDy3QrzAAOYVMmfGWIXxlU1ZtECQNfU07+6hXQ==" + }, + "DiscordRichPresence": { + "type": "Direct", + "requested": "[1.1.4.20, )", + "resolved": "1.1.4.20", + "contentHash": "rn7mW7qlg6PM4lQceECsguNsSFoxVtPoGeIpHYqAZbtmbo49zTzPPSQmNVwQFUWVeZ0XxBv+UtHOFdLo6T9t3A==", + "dependencies": { + "Microsoft.Win32.Registry": "4.5.0", + "Newtonsoft.Json": "13.0.1" + } + }, + "securifybv.ShellLink": { + "type": "Direct", + "requested": "[0.1.0, )", + "resolved": "0.1.0", + "contentHash": "VjJ8rJi6+yVla8DG1XRthwVneZq2Iojhf0KXwEKqJ+bIgbFTCIMpq33i0/HvPJSS1TdmaoGEnPHmjwP2ibenaA==", + "dependencies": { + "securifybv.PropertyStore": "0.1.0" + } + }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "2.0.0", + "contentHash": "VdLJOCXhZaEMY7Hm2GKiULmn7IEPFE4XC5LPSfBVCUIA8YLZVh846gtfBJalsPQF2PlzdD7ecX7DZEulJ402ZQ==" + }, + "Microsoft.Win32.Registry": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "+FWlwd//+Tt56316p00hVePBCouXyEzT86Jb3+AuRotTND0IYn0OO3obs1gnQEs/txEnt+rF2JBGLItTG+Be6A==", + "dependencies": { + "System.Security.AccessControl": "4.5.0", + "System.Security.Principal.Windows": "4.5.0" + } + }, + "Microsoft.Win32.SystemEvents": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "hqTM5628jSsQiv+HGpiq3WKBl2c8v1KZfby2J6Pr7pEPlK9waPdgEO6b8A/+/xn/yZ9ulv8HuqK71ONy2tg67A==" + }, + "Newtonsoft.Json": { + "type": "Transitive", + "resolved": "13.0.1", + "contentHash": "ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==" + }, + "securifybv.PropertyStore": { + "type": "Transitive", + "resolved": "0.1.0", + "contentHash": "N7oMyWl3RCbSi8SFK3vVtBpJD3OompLGZOwO2VQpyw6d8Qk8HTxCSuQzeSB4QzUWewQvMoQu5Qr5QgDQ1z5/5g==" + }, + "System.Drawing.Common": { + "type": "Transitive", + "resolved": "6.0.0", + "contentHash": "NfuoKUiP2nUWwKZN6twGqXioIe1zVD0RIj2t976A+czLHr2nY454RwwXs6JU9Htc6mwqL6Dn/nEL3dpVf2jOhg==", + "dependencies": { + "Microsoft.Win32.SystemEvents": "6.0.0" + } + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "vW8Eoq0TMyz5vAG/6ce483x/CP83fgm4SJe5P8Tb1tZaobcvPrbMEL7rhH1DRdrYbbb6F0vq3OlzmK0Pkwks5A==", + "dependencies": { + "Microsoft.NETCore.Platforms": "2.0.0", + "System.Security.Principal.Windows": "4.5.0" + } + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "4.5.0", + "contentHash": "U77HfRXlZlOeIXd//Yoj6Jnk8AXlbeisf1oq1os+hxOGVnuG+lGSfGqTwTZBoORFF6j/0q7HXIl8cqwQ9aUGqQ==", + "dependencies": { + "Microsoft.NETCore.Platforms": "2.0.0" + } + }, + "WPF-UI": { + "type": "Project", + "dependencies": { + "System.Drawing.Common": "[6.0.0, )" + } + } + } + } +} \ No newline at end of file diff --git a/wpfui b/wpfui index 12e37e9..329101f 160000 --- a/wpfui +++ b/wpfui @@ -1 +1 @@ -Subproject commit 12e37e980a1e5d99ff5dcb1f00a23d86be9c7b0c +Subproject commit 329101fe5671acf01f593f57bcbf9fd48797525b