Skip to content

Commit

Permalink
Merge pull request #11 from andrew-boyarshin/strong_name
Browse files Browse the repository at this point in the history
Strong name signing
  • Loading branch information
amerkoleci authored Apr 6, 2021
2 parents 2026ad6 + 79a360e commit 33d45c6
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 19 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@ jobs:

- name: Publish to NuGet
if: github.event_name == 'push'
run: |
run: |
if ( "${{github.ref}}" -match "^refs/tags/v[0-9]+\.[0-9]+\.[0-9]+$" ) {
dotnet nuget push build\packages\**\*.nupkg -s nuget.org -k ${{secrets.NUGET_TOKEN}} --no-symbols true
dotnet nuget push build\packages\**\*.nupkg -s https://api.nuget.org/v3/index.json -k ${{secrets.NUGET_TOKEN}}
dotnet nuget push build\packages\**\*.snupkg -s https://api.nuget.org/v3/index.json -k ${{secrets.NUGET_TOKEN}}
} else {
echo "publish is only enabled by tagging with a release tag"
}
28 changes: 15 additions & 13 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@
<LangVersion>9.0</LangVersion>
<Nullable>enable</Nullable>

<DebugType>embedded</DebugType>

<GenerateDocumentationFile>true</GenerateDocumentationFile>
<NoWarn>CS1591;CS1701</NoWarn>

Expand All @@ -20,24 +18,28 @@
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<PackageProjectUrl>https://github.com/amerkoleci/Vortice.Mathematics</PackageProjectUrl>
</PropertyGroup>

<PropertyGroup>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
</PropertyGroup>
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>

<PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
</PropertyGroup>
<SignAssembly Condition="'$(SignAssembly)' == ''">true</SignAssembly>
<VorticePublicKey>0024000004800000940000000602000000240000525341310004000001000100758064dc2d7cc685f393036f2d5fd6c3a8d9a811a6633e614a2a224c0aa45ef6e7dd9a45172f3b0055f0af31e7637b152a02263922c9fdfd0ed4408d30dcc26fc080c9d0e4c5e1307527e661037b4927b9f27b5318307698d474bf15506f21b9b2cf8155855624863b46584c11bf75bfde5dbbe8120c00524f713541725167cb</VorticePublicKey>
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Vortice.snk</AssemblyOriginatorKeyFile>

<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
<!-- Packages versions -->
<NerdbankGitVersioningVersion>3.3.37</NerdbankGitVersioningVersion>
<GitHubSourceLinkVersion>1.1.0-beta-20204-02</GitHubSourceLinkVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
<PackageReference Include="Nerdbank.GitVersioning" Version="$(NerdbankGitVersioningVersion)" PrivateAssets="All" />

<PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(GitHubSourceLinkVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>
</Project>
5 changes: 5 additions & 0 deletions src/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<Project>
<PropertyGroup>
<DefineConstants Condition="'$(SignAssembly)' == 'true'">$(DefineConstants);SIGNED_BUILD</DefineConstants>
</PropertyGroup>
</Project>
3 changes: 0 additions & 3 deletions src/Vortice.Mathematics/Properties/AssemblyInfo.cs

This file was deleted.

8 changes: 7 additions & 1 deletion src/Vortice.Mathematics/Vortice.Mathematics.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
<PackageReference Include="Microsoft.Bcl.HashCode " Version="1.1.0" />
<PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
</ItemGroup>

<ItemGroup>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
<_Parameter1>Vortice.Mathematics.PackedVector, PublicKey=$(VorticePublicKey)</_Parameter1>
</AssemblyAttribute>
</ItemGroup>

</Project>
Binary file added src/Vortice.snk
Binary file not shown.

0 comments on commit 33d45c6

Please sign in to comment.