Skip to content
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
8 changes: 4 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ jobs:
runs-on: windows-latest
name: Dotnet build
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v5
- run: |
git fetch --prune --unshallow
- run: |
git branch master origin/master
if: github.event_name != 'push' || (github.event_name == 'push' && github.ref != 'refs/heads/master')
- name: Setup dotnet
uses: actions/setup-dotnet@v1
uses: actions/setup-dotnet@v5
with:
dotnet-version: "2.2.103"
dotnet-version: 10.*
- name: Build
run: .\build.ps1
shell: pwsh
Expand All @@ -32,7 +32,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NUGET_TOKEN: ${{ secrets.NugetKey }}
- name: Add artifacts
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: ${{ steps.build.outputs.nupkg_name }}
path: ${{ steps.build.outputs.nupkg }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -112,3 +112,4 @@ Backup*/
UpgradeLog*.XML
/src/.vs/Slack.Webhooks/v15/Server/sqlite3
/.vs
.idea/
14 changes: 1 addition & 13 deletions build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -140,20 +140,8 @@ Task("DeployNuGet")
});

Task("Test")
.IsDependentOn("TestFramework")
.IsDependentOn("TestCore");

Task("TestFramework")
.IsDependentOn("Build")
.Does(() =>
{
var testAssemblies = GetFiles($"./src/**/bin/{configuration}/net45/*.Tests.dll");
XUnit2(testAssemblies, new XUnit2Settings {
Parallelism = ParallelismOption.All,
NoAppDomain = true
});
});

Task("TestCore")
.IsDependentOn("Build")
.Does(() =>
Expand All @@ -167,7 +155,7 @@ Task("TestCore")
DotNetCoreTest("./src/Slack.Webhooks.Tests/Slack.Webhooks.Tests.csproj", new DotNetCoreTestSettings
{
NoBuild = true,
Framework = "netcoreapp2",
Framework = "net10.0",
Configuration = configuration
}, coverletSettings);
});
Expand Down
75 changes: 28 additions & 47 deletions src/Slack.Webhooks.Tests/Slack.Webhooks.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,49 +1,30 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net45;netcoreapp2</TargetFrameworks>
<Deterministic>False</Deterministic>
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
</PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' != 'netcoreapp2' ">
<Reference Include="System"/>
<Reference Include="System.ComponentModel.Composition"/>
<Reference Include="System.Core"/>
<Reference Include="System.IO.Compression"/>
<Reference Include="System.Net.Http"/>
<Reference Include="System.Numerics"/>
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq"/>
<Reference Include="System.Data.DataSetExtensions"/>
<Reference Include="Microsoft.CSharp"/>
<Reference Include="System.Data"/>
<Reference Include="System.Xml"/>
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Slack.Webhooks\Slack.Webhooks.csproj">
<Project>{53751b1b-a63e-4e4f-988c-bc783e68b15f}</Project>
<Name>Slack.Webhooks</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config"/>
</ItemGroup>
<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="2.7.0">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0"/>
<PackageReference Include="Moq" Version="4.13.1"/>
<PackageReference Include="xunit" Version="2.4.1"/>
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="FluentAssertions" Version="5.9.0"/>
</ItemGroup>
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<Deterministic>False</Deterministic>
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
</PropertyGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Slack.Webhooks\Slack.Webhooks.csproj">
<Project>{53751b1b-a63e-4e4f-988c-bc783e68b15f}</Project>
<Name>Slack.Webhooks</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="8.0.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.4.0"/>
<PackageReference Include="Moq" Version="4.20.72"/>
<PackageReference Include="xunit" Version="2.9.3"/>
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="FluentAssertions" Version="8.9.0"/>
</ItemGroup>
</Project>
41 changes: 0 additions & 41 deletions src/Slack.Webhooks.Tests/packages.config

This file was deleted.

35 changes: 12 additions & 23 deletions src/Slack.Webhooks/Slack.Webhooks.csproj
Original file line number Diff line number Diff line change
@@ -1,26 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net45;netstandard1.3</TargetFrameworks>
<Deterministic>False</Deterministic>
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
<RepositoryUrl>https://github.com/mrb0nj/Slack.Webhooks.git</RepositoryUrl>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
<Reference Include="System" />
<Reference Include="System.Net" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Deterministic>False</Deterministic>
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
<RepositoryUrl>https://github.com/mrb0nj/Slack.Webhooks.git</RepositoryUrl>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.4"/>
</ItemGroup>


</Project>
23 changes: 4 additions & 19 deletions src/Slack.Webhooks/Slack.Webhooks.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -33,30 +33,15 @@
]]>
</releaseNotes>
<dependencies>
<group targetFramework=".NETFramework4.5">
<dependency id="Newtonsoft.Json" version="10.0.3" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETStandard1.3">
<dependency id="NETStandard.Library" version="1.6.1" exclude="Build,Analyzers" />
<dependency id="Newtonsoft.Json" version="10.0.3" exclude="Build,Analyzers" />
<group targetFramework=".NETStandard2.0">
<dependency id="NETStandard.Library" version="2.0.0" exclude="Build,Analyzers" />
<dependency id="Newtonsoft.Json" version="13.0.4" exclude="Build,Analyzers" />
</group>
</dependencies>
<frameworkAssemblies>
<frameworkAssembly assemblyName="Microsoft.CSharp" targetFramework=".NETFramework4.5" />
<frameworkAssembly assemblyName="System.Data.DataSetExtensions" targetFramework=".NETFramework4.5" />
<frameworkAssembly assemblyName="System.Data" targetFramework=".NETFramework4.5" />
<frameworkAssembly assemblyName="System" targetFramework=".NETFramework4.5" />
<frameworkAssembly assemblyName="System.Net" targetFramework=".NETFramework4.5" />
<frameworkAssembly assemblyName="System.Net.Http" targetFramework=".NETFramework4.5" />
<frameworkAssembly assemblyName="System.Runtime.Serialization" targetFramework=".NETFramework4.5" />
<frameworkAssembly assemblyName="System.Xml" targetFramework=".NETFramework4.5" />
<frameworkAssembly assemblyName="System.Xml.Linq" targetFramework=".NETFramework4.5" />
</frameworkAssemblies>
</metadata>

<files>
<file src="bin\Release\net45\Slack.Webhooks.dll" target="lib\net45\Slack.Webhooks.dll" />
<file src="bin\Release\netstandard1.3\Slack.Webhooks.dll" target="lib\netstandard1.3\Slack.Webhooks.dll" />
<file src="bin\Release\netstandard2.0\Slack.Webhooks.dll" target="lib\netstandard2.0\Slack.Webhooks.dll" />
<file src="..\..\slack.png" target="images\" />
</files>
</package>
Loading