From 65b82ba2a088ad2f11fdfe2b69604dcd3e24406d Mon Sep 17 00:00:00 2001 From: RMBGAME Date: Tue, 9 Nov 2021 06:34:40 +0800 Subject: [PATCH] Update .NET 6.0 --- .github/workflows/dotnet.yml | 2 +- Directory.Packages.props | 18 +++++++++--------- README.en.md | 2 +- README.md | 2 +- global.json | 2 +- references/ArchiSteamFarm | 2 +- references/FluentAvalonia | 2 +- references/Titanium-Web-Proxy | 2 +- references/WinAuth | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 569f01e89..ea9b037ad 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -22,7 +22,7 @@ jobs: - name: Setup .NET 6 uses: actions/setup-dotnet@v1 with: - dotnet-version: 6.0.100-rc.2.21505.57 + dotnet-version: 6.0.100 - name: Install macOS SDK(macOS) if: matrix.os == 'macOS-latest' diff --git a/Directory.Packages.props b/Directory.Packages.props index e8c34a1f8..277ce1a8d 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -16,23 +16,23 @@ - - - + + + - - + + - + @@ -58,8 +58,8 @@ - - + + @@ -130,7 +130,7 @@ - + diff --git a/README.en.md b/README.en.md index 0d052b41f..8498ab974 100644 --- a/README.en.md +++ b/README.en.md @@ -11,7 +11,7 @@ [![GitHub Fork](https://img.shields.io/github/forks/rmbadmin/SteamTools?style=flat-square)](https://github.com/rmbadmin/SteamTools/network/members) ![GitHub Repo size](https://img.shields.io/github/repo-size/rmbadmin/SteamTools?style=flat-square&color=3cb371) [![GitHub Repo Languages](https://img.shields.io/github/languages/top/SteamTools-Team/SteamTools?style=flat-square)](https://github.com/SteamTools-Team/SteamTools/search?l=c%23) -[![NET 6.0](https://img.shields.io/badge/dotnet-6.0-purple.svg?style=flat-square&color=512bd4)](https://devblogs.microsoft.com/dotnet/announcing-net-6-release-candidate-2) +[![NET 6.0](https://img.shields.io/badge/dotnet-6.0-purple.svg?style=flat-square&color=512bd4)](https://github.com/dotnet/core/blob/main/release-notes/6.0/6.0.0/6.0.0.md?WT.mc_id=dotnet-35129-website) [![C# 10.0](https://img.shields.io/badge/c%23-10.0-green.svg?style=flat-square&color=6da86a)](https://docs.microsoft.com/en-us/dotnet/csharp/whats-new/csharp-10) [![Desktop UI](https://img.shields.io/badge/ui@desktop-AvaloniaUI-purple.svg?style=flat-square&color=8c45ab)](https://github.com/AvaloniaUI/Avalonia) diff --git a/README.md b/README.md index be8d6b22f..f07c96b7d 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ [![GitHub Fork](https://img.shields.io/github/forks/SteamTools-Team/SteamTools?style=flat-square)](https://github.com/SteamTools-Team/SteamTools/network/members) ![GitHub Repo size](https://img.shields.io/github/repo-size/SteamTools-Team/SteamTools?style=flat-square&color=3cb371) [![GitHub Repo Languages](https://img.shields.io/github/languages/top/SteamTools-Team/SteamTools?style=flat-square)](https://github.com/SteamTools-Team/SteamTools/search?l=c%23) -[![NET 6.0](https://img.shields.io/badge/dotnet-6.0-purple.svg?style=flat-square&color=512bd4)](https://devblogs.microsoft.com/dotnet/announcing-net-6-release-candidate-2) +[![NET 6.0](https://img.shields.io/badge/dotnet-6.0-purple.svg?style=flat-square&color=512bd4)](https://github.com/dotnet/core/blob/main/release-notes/6.0/6.0.0/6.0.0.md?WT.mc_id=dotnet-35129-website) [![C# 10.0](https://img.shields.io/badge/c%23-10.0-brightgreen.svg?style=flat-square&color=6da86a)](https://docs.microsoft.com/zh-cn/dotnet/csharp/whats-new/csharp-10) [![Desktop UI](https://img.shields.io/badge/ui@desktop-AvaloniaUI-purple.svg?style=flat-square&color=8c45ab)](https://github.com/AvaloniaUI/Avalonia) diff --git a/global.json b/global.json index d2d0e7997..2e28b3c28 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "MSBuild.Sdk.Extras": "3.0.38" }, "sdk": { - "version": "6.0.100-rc.2.21505.57" + "version": "6.0.100" } } diff --git a/references/ArchiSteamFarm b/references/ArchiSteamFarm index 09417e49a..b8db23d14 160000 --- a/references/ArchiSteamFarm +++ b/references/ArchiSteamFarm @@ -1 +1 @@ -Subproject commit 09417e49a5f31eadb257a5e0ec6dae81c5a1daa0 +Subproject commit b8db23d14f37988a744f0b559d27da72b026caca diff --git a/references/FluentAvalonia b/references/FluentAvalonia index 5dbce7d94..3e9a327c9 160000 --- a/references/FluentAvalonia +++ b/references/FluentAvalonia @@ -1 +1 @@ -Subproject commit 5dbce7d942676156fd27c887406431cfa02dc4d3 +Subproject commit 3e9a327c9c0806a491ed19e9f31265801c3d6c5c diff --git a/references/Titanium-Web-Proxy b/references/Titanium-Web-Proxy index c3d25e256..8c8a2c6a7 160000 --- a/references/Titanium-Web-Proxy +++ b/references/Titanium-Web-Proxy @@ -1 +1 @@ -Subproject commit c3d25e256af1f5c1f7e516af657ab55209a931de +Subproject commit 8c8a2c6a76be2da26e30503b569fad6eca59ce28 diff --git a/references/WinAuth b/references/WinAuth index c50e607de..3942d43ce 160000 --- a/references/WinAuth +++ b/references/WinAuth @@ -1 +1 @@ -Subproject commit c50e607de64237b125bff92ded69593d74d8f127 +Subproject commit 3942d43ce8df3046ed37156567ff8325c517110b