Skip to content
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.

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

Update ArchiSteamFarm digest to d4e8182 #338

Merged
merged 3 commits into from
Nov 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
80 changes: 13 additions & 67 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: .NET
on: [ push, pull_request ]

env:
DOTNET_SDK_VERSION: 7.0.x
DOTNET_SDK_VERSION: 8

jobs:
build-generic:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout code
Expand All @@ -24,79 +24,35 @@ jobs:
run: dotnet restore

- name: Build with .NET Core
run: dotnet publish -c Release -f net7.0 -o out/${{ github.event.repository.name }}-generic
run: dotnet publish -c Release -f net8.0 -o out/${{ github.event.repository.name }}

- name: Upload generic artifacts
- name: Upload artifacts
uses: actions/upload-artifact@v3
with:
name: ${{ github.event.repository.name }}-generic
path: out/${{ github.event.repository.name }}-generic

build-generic-netf:
runs-on: windows-latest
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Checkout submodules
run: git submodule update --init --recursive

- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: ${{ env.DOTNET_SDK_VERSION }}

- name: Restore dependencies
run: dotnet restore

- name: Disable local packages source
run: dotnet nuget disable source "Microsoft Visual Studio Offline Packages"

- name: Build with .NET Framework
run: dotnet publish -c Release -f net481 -o out/${{ github.event.repository.name }}-generic-netf

- name: Upload generic-netf artifacts
uses: actions/upload-artifact@v3
with:
name: ${{ github.event.repository.name }}-generic-netf
path: out/${{ github.event.repository.name }}-generic-netf
name: ${{ github.event.repository.name }}
path: out/${{ github.event.repository.name }}

release:
if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') }}
needs: [build-generic-netf, build-generic]
needs: [build]
runs-on: ubuntu-latest

steps:
- name: Download generic artifacts
uses: actions/[email protected]
with:
name: ${{ github.event.repository.name }}-generic
path: out/${{ github.event.repository.name }}-generic

- name: Download generic-netf artifacts
- name: Download artifacts
uses: actions/[email protected]
with:
name: ${{ github.event.repository.name }}-generic-netf
path: out/${{ github.event.repository.name }}-generic-netf
name: ${{ github.event.repository.name }}
path: out/${{ github.event.repository.name }}

- name: Archive generic release
- name: Archive release
uses: thedoctor0/zip-release@master
with:
directory: out
path: ${{ github.event.repository.name }}-generic
path: ${{ github.event.repository.name }}
type: 'zip'
filename: 'generic.zip'
exclusions: '*.json'

- name: Archive generic-netf release
uses: thedoctor0/zip-release@master
with:
directory: out
path: ${{ github.event.repository.name }}-generic-netf
type: 'zip'
filename: 'generic-netf.zip'
exclusions: '*.json'

- name: Create GitHub release
id: github_release
uses: actions/[email protected]
Expand All @@ -106,7 +62,7 @@ jobs:
tag_name: ${{ github.ref }}
release_name: ${{ github.event.repository.name }} V${{ github.ref }}

- name: Upload generic artifacts to GitHub release
- name: Upload artifacts to GitHub release
uses: actions/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -115,13 +71,3 @@ jobs:
asset_path: out/generic.zip
asset_name: generic.zip
asset_content_type: application/zip

- name: Upload generic-netf artifacts to GitHub release
uses: actions/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.github_release.outputs.upload_url }}
asset_path: out/generic-netf.zip
asset_name: generic-netf.zip
asset_content_type: application/zip
2 changes: 1 addition & 1 deletion ArchiSteamFarm
Submodule ArchiSteamFarm updated 138 files
4 changes: 1 addition & 3 deletions SteamKitProxyInjection/SteamKitProxyInjectionPlugin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,7 @@ public Task OnASFInit(IReadOnlyDictionary<string, JToken>? additionalConfigPrope
[SuppressMessage("ReSharper", "InconsistentNaming")]
#pragma warning disable CA1707
public static void TargetMethod(ClientWebSocket ___socket) {
if (___socket == null) {
throw new ArgumentNullException(nameof(___socket));
}
ArgumentNullException.ThrowIfNull(___socket);

ASF.ArchiLogger.LogGenericTrace("Retrieving WebProxy config value...");
IWebProxy? webProxy = ASF.GlobalConfig?.WebProxy;
Expand Down
Loading