Skip to content

Commit 22eab7d

Browse files
bonk-devbonk-dev
authored
Merge pull request #22 from bonk-dev/chore/use-directory-build-prosp
chore: Add Directory.Build.props
2 parents 0afc118 + cf26d76 commit 22eab7d

15 files changed

Lines changed: 39 additions & 79 deletions

File tree

‎.github/workflows/dotnet.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@ jobs:
3030
uses: codecov/codecov-action@v7
3131
env:
3232
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
33-
- name: Pack NuGet Package
33+
- name: Pack main NuGet Package
3434
run: dotnet pack HarpoS7/HarpoS7.csproj -c Release --output ./nupkg_output
35+
- name: Pack PublicKeys NuGet Package
36+
run: dotnet pack HarpoS7.PublicKeys/HarpoS7.PublicKeys.csproj -c Release --output ./nupkg_output
3537
- name: Upload NuGet Package as Artifact
3638
uses: actions/upload-artifact@v7
3739
with:
38-
name: HarpoS7-NuGet-Package
40+
name: HarpoS7-NuGet-Packages
3941
path: ./nupkg_output/*.nupkg

‎Directory.Build.props‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
<Project>
2+
<PropertyGroup>
3+
<TargetFramework>net8.0</TargetFramework>
4+
<ImplicitUsings>enable</ImplicitUsings>
5+
<Nullable>enable</Nullable>
6+
<LangVersion>latest</LangVersion>
7+
8+
<PackageProjectUrl>https://github.com/bonk-dev/HarpoS7</PackageProjectUrl>
9+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
10+
<RepositoryUrl>https://github.com/bonk-dev/HarpoS7</RepositoryUrl>
11+
<RepositoryType>git</RepositoryType>
12+
<PackageTags>siemens;s7</PackageTags>
13+
14+
<PackageVersion>1.1.2</PackageVersion>
15+
<AssemblyVersion>1.1.2</AssemblyVersion>
16+
<FileVersion>1.1.2</FileVersion>
17+
<Version>1.1.2</Version>
18+
<PackageReleaseNotes>Internal naming changes</PackageReleaseNotes>
19+
20+
<PackageIcon>nuget-icon.png</PackageIcon>
21+
</PropertyGroup>
22+
23+
<ItemGroup>
24+
<None Include="$(MSBuildThisFileDirectory)tools\nuget-icon.png" Pack="true" PackagePath="\" />
25+
</ItemGroup>
26+
</Project>

‎HarpoS7.Family0.Tests/HarpoS7.Family0.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>enable</Nullable>
7-
84
<IsPackable>false</IsPackable>
95
<IsTestProject>true</IsTestProject>
106
</PropertyGroup>

‎HarpoS7.Family0/HarpoS7.Family0.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>enable</Nullable>
74
<IsPackable>false</IsPackable>
85
</PropertyGroup>
96

‎HarpoS7.KeyDumper.Cli/HarpoS7.KeyDumper.Cli.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
<Nullable>enable</Nullable>
85
</PropertyGroup>
96

107
<ItemGroup>

‎HarpoS7.KeyDumper.Tests/HarpoS7.KeyDumper.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>enable</Nullable>
7-
84
<IsPackable>false</IsPackable>
95
<IsTestProject>true</IsTestProject>
106
</PropertyGroup>

‎HarpoS7.KeyDumper/HarpoS7.KeyDumper.csproj‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>enable</Nullable>
7-
</PropertyGroup>
3+
<PropertyGroup></PropertyGroup>
84

95
</Project>

‎HarpoS7.PoC/HarpoS7.PoC.csproj‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
6-
<ImplicitUsings>enable</ImplicitUsings>
7-
<Nullable>enable</Nullable>
8-
<AssemblyVersion>1.1.0</AssemblyVersion>
9-
<FileVersion>1.1.0</FileVersion>
105
</PropertyGroup>
116

127
<ItemGroup>

‎HarpoS7.PublicKeys.Tests/HarpoS7.PublicKeys.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>enable</Nullable>
7-
84
<IsPackable>false</IsPackable>
95
<IsTestProject>true</IsTestProject>
106
</PropertyGroup>

‎HarpoS7.PublicKeys/HarpoS7.PublicKeys.csproj‎

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

3-
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>enable</Nullable>
3+
<PropertyGroup>
4+
<PackageId>HarpoS7.PublicKeys</PackageId>
5+
<Title>HarpoS7.PublicKeys</Title>
6+
<Description>Public keys and cryptographic assets required for HarpoS7 authentication.</Description>
77
</PropertyGroup>
88

9-
<ItemGroup>
10-
11-
</ItemGroup>
12-
139
<ItemGroup>
1410
<None Remove="Keys\00\1B580465BB0551B2.bin" />
1511
<EmbeddedResource Include="Keys\00\1B580465BB0551B2.bin" />

0 commit comments

Comments
 (0)