Skip to content

Commit d2cfbb6

Browse files
AoshiWAoshiW
AoshiW
authored and
AoshiW
committed
update dependencies, add Directory.Build.props 
1 parent cb803b4 commit d2cfbb6

File tree

11 files changed

+65
-83
lines changed

11 files changed

+65
-83
lines changed

‎.github/workflows/check-buildstatus.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v5
1414
- name: Setup .NET
15-
uses: actions/setup-dotnet@v3
15+
uses: actions/setup-dotnet@v5
1616
with:
17-
dotnet-version: 8.0.x
17+
dotnet-version: 10.0.x
1818
- name: Restore dependencies
1919
run: dotnet restore
2020
- name: Build TwitchLib.Client

‎.github/workflows/preview-release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v5
1414
- name: Setup .NET
15-
uses: actions/setup-dotnet@v3
15+
uses: actions/setup-dotnet@v5
1616
with:
17-
dotnet-version: 8.0.x
17+
dotnet-version: 10.0.x
1818
- name: Restore dependencies
1919
run: dotnet restore
2020
- name: Build TwitchLib.Client
2121
run: dotnet build -c Release --no-restore
2222
- name: Pack TwitchLib.Client
2323
run: dotnet pack TwitchLib.Client.sln -v normal -c Release -o nugets --no-build --version-suffix "preview.${{ github.run_number }}.${{ github.sha }}"
2424
- name: Push to Nuget
25-
run: dotnet nuget push "./nugets/*.nupkg" -k ${{ secrets.API_NUGET_TOKEN }} -s https://api.nuget.org/v3/index.json
25+
run: dotnet nuget push "./artifacts/package/release/*.nupkg" -k ${{ secrets.API_NUGET_TOKEN }} -s https://api.nuget.org/v3/index.json
2626
- name: Send Discord Notification
2727
uses: sarisia/actions-status-discord@v1
2828
if: always()

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,19 @@ jobs:
1010
runs-on: ubuntu-latest
1111

1212
steps:
13-
- uses: actions/checkout@v4
13+
- uses: actions/checkout@v5
1414
- name: Setup .NET
15-
uses: actions/setup-dotnet@v3
15+
uses: actions/setup-dotnet@v5
1616
with:
17-
dotnet-version: 8.0.x
17+
dotnet-version: 10.0.x
1818
- name: Restore dependencies
1919
run: dotnet restore
2020
- name: Build TwitchLib.Client
2121
run: dotnet build -c Release --no-restore
2222
- name: Pack TwitchLib.Client
2323
run: dotnet pack TwitchLib.Client.sln -v normal -c Release -o nugets --no-build
2424
- name: Push to Nuget
25-
run: dotnet nuget push "./nugets/*.nupkg" -k ${{ secrets.API_NUGET_TOKEN }} -s https://api.nuget.org/v3/index.json
25+
run: dotnet nuget push "./artifacts/package/release/*.nupkg" -k ${{ secrets.API_NUGET_TOKEN }} -s https://api.nuget.org/v3/index.json
2626
- name: Send Discord Notification
2727
uses: sarisia/actions-status-discord@v1
2828
if: always()

‎Directory.Build.props‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<Project>
2+
<!-- See https://aka.ms/dotnet/msbuild/customize for more details on customizing your build -->
3+
4+
<PropertyGroup>
5+
<ArtifactsPath>$(MSBuildThisFileDirectory)artifacts</ArtifactsPath>
6+
<ImplicitUsings>enable</ImplicitUsings>
7+
<Nullable>enable</Nullable>
8+
<LangVersion>latest</LangVersion>
9+
<Features>strict</Features>
10+
11+
<NeutralLanguage>en-US</NeutralLanguage>
12+
<GenerateDocumentationFile>True</GenerateDocumentationFile>
13+
</PropertyGroup>
14+
15+
<!--Package-->
16+
<PropertyGroup>
17+
<Authors>swiftyspiffy, Prom3theu5, Syzuna, LuckyNoS7evin</Authors>
18+
<Copyright>Copyright 2025</Copyright>
19+
<PackageIcon>twitchlib.png</PackageIcon>
20+
<PackageProjectUrl>https://github.com/TwitchLib/TwitchLib.Client</PackageProjectUrl>
21+
<RepositoryUrl>https://github.com/TwitchLib/TwitchLib.Client</RepositoryUrl>
22+
<RepositoryType>Git</RepositoryType>
23+
<PackageTags>twitch library irc chat c# csharp api events net</PackageTags>
24+
<PackageReleaseNotes>a lot of changes</PackageReleaseNotes>
25+
<VersionPrefix>4.0.1</VersionPrefix>
26+
<VersionSuffix>$(VersionSuffix)</VersionSuffix>
27+
<AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
28+
<FileVersion>$(VersionPrefix)</FileVersion>
29+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
30+
</PropertyGroup>
31+
32+
</Project>

‎TwitchLib.Client.Benchmark/TwitchLib.Client.Benchmark.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@
44
<OutputType>Exe</OutputType>
55
<TargetFramework>net8.0</TargetFramework>
66
<IsPackable>false</IsPackable>
7-
<ImplicitUsings>enable</ImplicitUsings>
8-
<Nullable>enable</Nullable>
97
<WarningsAsErrors>nullable</WarningsAsErrors>
108
</PropertyGroup>
119

1210
<ItemGroup>
13-
<PackageReference Include="BenchmarkDotNet" Version="0.13.10" />
11+
<PackageReference Include="BenchmarkDotNet" Version="0.15.6" />
1412
</ItemGroup>
1513

1614
<ItemGroup>

‎TwitchLib.Client.Enums/TwitchLib.Client.Enums.csproj‎

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
5-
<LangVersion>latest</LangVersion>
6-
<PackageId>TwitchLib.Client.Enums</PackageId>
7-
<VersionPrefix>4.0.1</VersionPrefix>
8-
<VersionSuffix>$(VersionSuffix)</VersionSuffix>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0</TargetFrameworks>
95
<Description>Project containing all of the enums used in TwitchLib.Client.</Description>
10-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
11-
<Authors>swiftyspiffy, Prom3theu5, Syzuna, LuckyNoS7evin</Authors>
12-
<PackageIconUrl>https://cdn.syzuna-programs.de/images/twitchlib.png</PackageIconUrl>
13-
<PackageProjectUrl>https://github.com/TwitchLib/TwitchLib.Client</PackageProjectUrl>
14-
<PackageLicenseUrl>https://opensource.org/licenses/MIT</PackageLicenseUrl>
15-
<Copyright>Copyright 2023</Copyright>
16-
<PackageReleaseNotes>Incremental changes. See commit history.</PackageReleaseNotes>
17-
<RepositoryUrl>https://github.com/TwitchLib/TwitchLib.Client</RepositoryUrl>
18-
<RepositoryType>Git</RepositoryType>
19-
<PackageTags>twitch library irc chat c# csharp api events pubsub net standard 2.0</PackageTags>
20-
<NeutralLanguage>en-US</NeutralLanguage>
21-
<AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
22-
<FileVersion>$(VersionPrefix)</FileVersion>
23-
<GenerateDocumentationFile>True</GenerateDocumentationFile>
246
</PropertyGroup>
7+
258
</Project>

‎TwitchLib.Client.Example/TwitchLib.Client.Example.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
12+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.10" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎TwitchLib.Client.Models/TwitchLib.Client.Models.csproj‎

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>enable</Nullable>
7-
<LangVersion>latest</LangVersion>
8-
<PackageId>TwitchLib.Client.Models</PackageId>
9-
<VersionPrefix>4.0.1</VersionPrefix>
10-
<VersionSuffix>$(VersionSuffix)</VersionSuffix>
4+
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0</TargetFrameworks>
115
<Description>Project contains all of the models used in TwitchLib.Client.</Description>
12-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
13-
<Authors>swiftyspiffy, Prom3theu5, Syzuna, LuckyNoS7evin</Authors>
14-
<PackageIconUrl>https://cdn.syzuna-programs.de/images/twitchlib.png</PackageIconUrl>
15-
<PackageProjectUrl>https://github.com/TwitchLib/TwitchLib.Client</PackageProjectUrl>
16-
<PackageLicenseUrl>https://opensource.org/licenses/MIT</PackageLicenseUrl>
17-
<Copyright>Copyright 2023</Copyright>
18-
<PackageReleaseNotes>Incremental changes. See commit history.</PackageReleaseNotes>
19-
<RepositoryUrl>https://github.com/TwitchLib/TwitchLib.Client</RepositoryUrl>
20-
<RepositoryType>Git</RepositoryType>
21-
<PackageTags>twitch library irc chat c# csharp api events pubsub net standard 2.0</PackageTags>
22-
<NeutralLanguage>en-US</NeutralLanguage>
23-
<AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
24-
<FileVersion>$(VersionPrefix)</FileVersion>
25-
<GenerateDocumentationFile>True</GenerateDocumentationFile>
266
</PropertyGroup>
7+
278
<ItemGroup>
289
<ProjectReference Include="..\TwitchLib.Client.Enums\TwitchLib.Client.Enums.csproj" />
2910
</ItemGroup>
11+
3012
<ItemGroup>
3113
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
3214
<!-- This is a punishment for worshiping wrong gods of abstraction -->
@@ -36,7 +18,9 @@
3618
<_Parameter1>TwitchLib.Client.Test</_Parameter1>
3719
</AssemblyAttribute>
3820
</ItemGroup>
21+
3922
<ItemGroup>
40-
<PackageReference Include="System.Memory" Version="4.5.5" />
23+
<PackageReference Include="System.Memory" Version="4.5.5" Condition="$(TargetFramework) == 'netstandard2.0'" />
4124
</ItemGroup>
25+
4226
</Project>

‎TwitchLib.Client.Test/TwitchLib.Client.Test.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@
33
<PropertyGroup>
44
<TargetFrameworks>net8.0</TargetFrameworks>
55
<IsPackable>false</IsPackable>
6-
<Nullable>enable</Nullable>
76
</PropertyGroup>
87

98
<ItemGroup>
109
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
11-
<PackageReference Include="Moq" Version="4.18.4" />
10+
<PackageReference Include="Moq" Version="[4.18.4]" />
1211
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
1312
<PackageReference Include="System.Net.Security" Version="4.3.2" />
1413
<PackageReference Include="xunit" Version="2.6.1" />

‎TwitchLib.Client.sln‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
4-
VisualStudioVersion = 17.14.36310.24
4+
VisualStudioVersion = 17.14.36623.8 d17.14
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TwitchLib.Client", "TwitchLib.Client\TwitchLib.Client.csproj", "{44B88EFA-1500-4005-AF27-A9BCB9DD79C1}"
77
EndProject
@@ -19,6 +19,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TwitchLib.Client.Benchmark"
1919
EndProject
2020
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TwitchLib.Client.Example", "TwitchLib.Client.Example\TwitchLib.Client.Example.csproj", "{0C5D0C17-346C-6CE8-EC3E-4DCAC37152FC}"
2121
EndProject
22+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}"
23+
ProjectSection(SolutionItems) = preProject
24+
Directory.Build.props = Directory.Build.props
25+
EndProjectSection
26+
EndProject
2227
Global
2328
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2429
Debug|Any CPU = Debug|Any CPU

0 commit comments

Comments
 (0)