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
26 changes: 23 additions & 3 deletions .github/workflows/custom-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ jobs:

# Build solution
- name: Build solution
run: msbuild ${{ env.solution-name }} /p:Configuration="${{ inputs.configuration }}" /p:TargetFramework="${{ inputs.framework }}" /p:Platform="${{ inputs.platform }}"
run: msbuild -t:pack ${{ env.solution-name }} /p:Configuration="${{ inputs.configuration }}" /p:TargetFramework="${{ inputs.framework }}" /p:Platform="${{ inputs.platform }}"
# run: dotnet pack ${{ env.solution-name }} --configuration "${{ inputs.configuration }}" -p:TargetFrameworks="${{ inputs.framework }}" --runtime "${{ inputs.platform }}" --output "${{ env.dll-path }}"

# Set versioned DLL file path in environment
- name: Set versioned DLL file path in environment
Expand Down Expand Up @@ -118,7 +119,9 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: "[${{ env.sanitized_branch_name }}] ARSoft Tools v${{ steps.export-version.outputs.dll_version }} ${{ inputs.configuration }} ${{ inputs.platform }}"
path: ${{ env.dll-path }}/*.dll
path: |
${{ env.dll-path }}/*.dll
${{ env.dll-path }}/*.pdb
if-no-files-found: warn

# Wait for a random duration between 1 and 10 seconds to allow the release to be created
Expand Down Expand Up @@ -148,9 +151,26 @@ jobs:
echo "message=Build failed, check annotations for details" >> $GITHUB_OUTPUT
shell: bash

upload_packages:
name: Publish package to NuGet
needs: [build, check_trigger]
runs-on: ubuntu-latest
container: mcr.microsoft.com/dotnet/sdk:latest
steps:
- uses: actions/download-artifact@v4
name: Download Artifact
with:
name: build
path: ${{ env.dll-path }}/

- name: Upload Nuget Packages
run: |
dotnet nuget push "outputs/*.nupkg" --api-key ${{ secrets.GH_TOKEN }} --source https://nuget.pkg.github.com/${{ github.repository_owner }}
dotnet nuget push "outputs/*.snupkg" --api-key ${{ secrets.GH_TOKEN }} --source https://nuget.pkg.github.com/${{ github.repository_owner }}

check_status_and_report:
name: Check action result
needs: [build, check_trigger]
needs: [build, upload_packages, check_trigger]
if: needs.check_trigger.outputs.run_build == 'true'
outputs:
slack_message_body: ${{ steps.create_message.outputs.message_body }}
Expand Down
20 changes: 12 additions & 8 deletions ARSoft.Tools.Net.sln
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,26 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ARSoft.Tools.Net", "ARSoft.
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
Release|x64 = Release|x64
Debug|ARM64 = Debug|ARM64
Release|ARM64 = Release|ARM64
Debug|Any CPU = Debug|Any CPU
Debug|ARM64 = Debug|ARM64
Debug|x64 = Debug|x64
Release|Any CPU = Release|Any CPU
Release|ARM64 = Release|ARM64
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{65BFA748-C640-49B0-B506-34BBB165233A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{65BFA748-C640-49B0-B506-34BBB165233A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{65BFA748-C640-49B0-B506-34BBB165233A}.Debug|ARM64.ActiveCfg = Debug|ARM64
{65BFA748-C640-49B0-B506-34BBB165233A}.Debug|ARM64.Build.0 = Debug|ARM64
{65BFA748-C640-49B0-B506-34BBB165233A}.Debug|x64.ActiveCfg = Debug|x64
{65BFA748-C640-49B0-B506-34BBB165233A}.Debug|x64.Build.0 = Debug|x64
{65BFA748-C640-49B0-B506-34BBB165233A}.Release|x64.ActiveCfg = Release|x64
{65BFA748-C640-49B0-B506-34BBB165233A}.Release|x64.Build.0 = Release|x64
{65BFA748-C640-49B0-B506-34BBB165233A}.Debug|ARM64.ActiveCfg = Debug|ARM64
{65BFA748-C640-49B0-B506-34BBB165233A}.Debug|ARM64.Build.0 = Debug|ARM64
{65BFA748-C640-49B0-B506-34BBB165233A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{65BFA748-C640-49B0-B506-34BBB165233A}.Release|Any CPU.Build.0 = Release|Any CPU
{65BFA748-C640-49B0-B506-34BBB165233A}.Release|ARM64.ActiveCfg = Release|ARM64
{65BFA748-C640-49B0-B506-34BBB165233A}.Release|ARM64.Build.0 = Release|ARM64
{65BFA748-C640-49B0-B506-34BBB165233A}.Release|x64.ActiveCfg = Release|x64
{65BFA748-C640-49B0-B506-34BBB165233A}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
5 changes: 3 additions & 2 deletions ARSoft.Tools.Net.sln.DotSettings
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderRegionName/@EntryValue">Copyright and License</s:String>
<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">Copyright 2010..$CURRENT_YEAR$ Alexander Reinert&#xD;
<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">Copyright 2010..${CurrentDate.Year} Alexander Reinert&#xD;
&#xD;
This file is part of the ARSoft.Tools.Net - C# DNS client/server and SPF Library (https://github.com/alexreinert/ARSoft.Tools.Net)&#xD;
&#xD;
Expand All @@ -15,4 +15,5 @@ distributed under the License is distributed on an "AS IS" BASIS,&#xD;
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.&#xD;
See the License for the specific language governing permissions and&#xD;
limitations under the License.&#xD;
</s:String></wpf:ResourceDictionary>
</s:String>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EFeature_002EServices_002ECodeCleanup_002EFileHeader_002EFileHeaderSettingsMigrate/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
31 changes: 30 additions & 1 deletion ARSoft.Tools.Net/ARSoft.Tools.Net.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,25 @@
<AssemblyVersion>$(VersionPrefix)</AssemblyVersion>
<Platforms>AnyCPU;x64;ARM64</Platforms>
</PropertyGroup>

<PropertyGroup>
<!-- Enables Symbol Support -->
<IncludeSymbols>true</IncludeSymbols>
<!-- Enables a separate NuGet Package for Symbols, preventing it from leaking into production. -->
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<!-- Publishes the NuGet Package with information on the repository it came from (needed for GitHub actions to work properly) -->
<PublishRepositoryUrl>true</PublishRepositoryUrl>
</PropertyGroup>

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="BouncyCastle.Cryptography" Version="2.6.0" />
<PackageReference Include="BouncyCastle.Cryptography" Version="2.6.1" />
<PackageReference Include="System.Net.Sockets" Version="4.3.0" />
<PackageReference Include="NuGet.Build.Tasks.Pack" Version="6.14.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
Expand Down Expand Up @@ -59,30 +73,45 @@
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0|AnyCPU'">
<IsAotCompatible>True</IsAotCompatible>
<IsTrimmable>True</IsTrimmable>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;PARAMETRIZABLE</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0|x64'">
<IsAotCompatible>True</IsAotCompatible>
<IsTrimmable>True</IsTrimmable>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;PARAMETRIZABLE</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net8.0|ARM64'">
<IsAotCompatible>True</IsAotCompatible>
<IsTrimmable>True</IsTrimmable>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<DefineConstants>DEBUG;TRACE;PARAMETRIZABLE</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0|AnyCPU'">
<IsAotCompatible>True</IsAotCompatible>
<IsTrimmable>True</IsTrimmable>
<DebugType>pdbonly</DebugType>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0|x64'">
<IsAotCompatible>True</IsAotCompatible>
<IsTrimmable>True</IsTrimmable>
<DebugType>pdbonly</DebugType>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net8.0|ARM64'">
<IsAotCompatible>True</IsAotCompatible>
<IsTrimmable>True</IsTrimmable>
<DebugType>pdbonly</DebugType>
</PropertyGroup>
</Project>
Loading
Loading