summary refs log tree commit diff
diff options
context:
space:
mode:
authorClaire Novotny <claire@novotny.org>2020-03-29 18:58:52 -0400
committerClaire Novotny <claire@novotny.org>2020-03-29 18:58:52 -0400
commite72e3a8a96b0cd4e83d51f5b4ae83bc520c4c894 (patch)
tree26317a738680ee76aa0a6a3336ab624bcc39a739
parentMerge branch 'master' into netstandard (diff)
downloadBouncyCastle.NET-ed25519-e72e3a8a96b0cd4e83d51f5b4ae83bc520c4c894.tar.xz
enable deterministic builds pcl-v1.8.6.7
-rw-r--r--Directory.Build.targets10
-rw-r--r--crypto/src/crypto.csproj17
2 files changed, 21 insertions, 6 deletions
diff --git a/Directory.Build.targets b/Directory.Build.targets
new file mode 100644
index 000000000..1543cb15b
--- /dev/null
+++ b/Directory.Build.targets
@@ -0,0 +1,10 @@
+<!-- Workaround. Remove once we're on 3.1.300+
+https://github.com/dotnet/sourcelink/issues/572 -->
+<Project>
+  <PropertyGroup>
+    <TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
+  </ItemGroup>
+</Project>
diff --git a/crypto/src/crypto.csproj b/crypto/src/crypto.csproj
index 0fc60462d..7a890a497 100644
--- a/crypto/src/crypto.csproj
+++ b/crypto/src/crypto.csproj
@@ -8,22 +8,26 @@
     <Product>Bouncy Castle for .NET ($(TargetFramework))</Product>
     <Copyright>© 2000-2020 Legion of the Bouncy Castle Inc. </Copyright>
     <Company>The Legion of the Bouncy Castle Inc.</Company>
-    <Authors>Oren Novotny</Authors>
+    <Authors>Claire Novotny</Authors>
     <Title>Bouncy Castle Portable</Title>
     <PackageId>Portable.BouncyCastle</PackageId>
-    <Description>BouncyCastle portable version with support for .NET 4, .NET Standard 2.0, .NET Core</Description>
+    <Description>BouncyCastle portable version with support for .NET 4, .NET Standard 2.0</Description>
     <DebugType>embedded</DebugType>
     <PackageLicenseUrl>https://www.bouncycastle.org/csharp/licence.html</PackageLicenseUrl>
     <PackageProjectUrl>https://www.bouncycastle.org/csharp/</PackageProjectUrl>
-    <PackageReleaseNotes>https://www.bouncycastle.org/csharp/#RELEASENOTES186</PackageReleaseNotes>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/onovotny/bc-csharp</RepositoryUrl>
+    <PackageReleaseNotes>https://www.bouncycastle.org/csharp/#RELEASENOTES186</PackageReleaseNotes>    
     <PackageIconUrl>https://www.bouncycastle.org/images/csharp_logo.gif</PackageIconUrl>
     <PackageTags>bouncycastle cryptography encryption security</PackageTags>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <NoWarn>1591;618;672</NoWarn>
   </PropertyGroup>
+
+  <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    <Deterministic>true</Deterministic>
+  </PropertyGroup>  
+  
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
@@ -33,10 +37,11 @@
   <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
     <DefineConstants>$(DefineConstants);PORTABLE;NO_THREADS;NEW_REFLECTION;SYS_RUNTIME;DOTNET</DefineConstants>
   </PropertyGroup>
+
   <ItemGroup>
     <Compile Include="..\bzip2\src\**\*.cs" LinkBase="bzip2" />
     <None Include="..\..\BouncyCastle.snk" />
-    <PackageReference Include="NerdBank.GitVersioning" Version="3.0.50" PrivateAssets="All" />
+    <PackageReference Include="NerdBank.GitVersioning" Version="3.1.74" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
   </ItemGroup>