Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include symbols and deterministic build #910

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ TestResults
*.orig
Help/*
release/*
/_ReSharper.*
_ReSharper.*
*.pidb
*.userprefs
packages
Expand Down
26 changes: 11 additions & 15 deletions YamlDotNet/YamlDotNet.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@

<NetStandard>false</NetStandard>
<RealTargetFramework>$(TargetFramework)</RealTargetFramework>

<DebugSymbols>true</DebugSymbols>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
Expand Down Expand Up @@ -49,6 +53,7 @@
</PropertyGroup>

<ItemGroup>
<None Include="../README.md" Pack="true" PackagePath="README.md" />
<None Include="../LICENSE.txt" Pack="true" PackagePath="LICENSE.txt" />
</ItemGroup>

Expand All @@ -58,37 +63,28 @@

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<DefineConstants>$(DefineConstants);RELEASE;TRACE;SIGNED</DefineConstants>
<DebugSymbols>false</DebugSymbols>
<DebugType>portable</DebugType>
<Optimize>true</Optimize>
</PropertyGroup>

<PropertyGroup Condition="'$(NetStandard)' == 'false'">
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
</PropertyGroup>

<ItemGroup Condition="'$(NetStandard)' == 'false'">
<Reference Include="System" />
<Reference Include="System.Core" />
</ItemGroup>

<ItemGroup Condition="'$(NetStandard)' == 'true'">
<PackageReference Include="System.Runtime.Serialization.Formatters">
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="System.ComponentModel.TypeConverter">
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="System.Diagnostics.Debug">
<Version>4.3.0</Version>
</PackageReference>
<PackageReference Include="System.Runtime.Serialization.Formatters" Version="4.3.0" />
<PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
<PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />
</ItemGroup>

<Target Name="Info" BeforeTargets="CoreCompile">
<PropertyGroup>
<Empty></Empty>
</PropertyGroup>
<Message Importance="high" Text=" " Condition="'$(RealTargetFramework)' != ''" />
<Message Importance="high" Text="==== Building $(RealTargetFramework) $(Empty.PadRight($([MSBuild]::Subtract(100, $(RealTargetFramework.Length))), '='))" Condition="'$(RealTargetFramework)' != ''" />
</Target>
Expand Down
8 changes: 8 additions & 0 deletions YamlDotNet/YamlDotNet.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<icon>images/yamldotnet.png</icon>
<repository type="git" url="https://github.com/aaubry/YamlDotNet.git" />
<tags>yaml parser development library serialization</tags>
<readme>README.md</readme>
<dependencies>
<group targetFramework=".NETFramework4.7" />
<group targetFramework=".NETStandard2.0" />
Expand All @@ -24,23 +25,30 @@
</metadata>
<files>
<file src="bin/Release/net47/YamlDotNet.dll" target="lib/net47" />
<file src="bin/Release/net47/YamlDotNet.pdb" target="lib/net47" />
<file src="bin/Release/net47/YamlDotNet.xml" target="lib/net47" />

<file src="bin/Release/net6.0/YamlDotNet.dll" target="lib/net6.0" />
<file src="bin/Release/net6.0/YamlDotNet.pdb" target="lib/net6.0" />
<file src="bin/Release/net6.0/YamlDotNet.xml" target="lib/net6.0" />

<file src="bin/Release/net7.0/YamlDotNet.dll" target="lib/net7.0" />
<file src="bin/Release/net7.0/YamlDotNet.pdb" target="lib/net7.0" />
<file src="bin/Release/net7.0/YamlDotNet.xml" target="lib/net7.0" />

<file src="bin/Release/net8.0/YamlDotNet.dll" target="lib/net8.0" />
<file src="bin/Release/net8.0/YamlDotNet.pdb" target="lib/net8.0" />
<file src="bin/Release/net8.0/YamlDotNet.xml" target="lib/net8.0" />

<file src="bin/Release/netstandard2.0/YamlDotNet.dll" target="lib/netstandard2.0" />
<file src="bin/Release/netstandard2.0/YamlDotNet.pdb" target="lib/netstandard2.0" />
<file src="bin/Release/netstandard2.0/YamlDotNet.xml" target="lib/netstandard2.0" />

<file src="bin/Release/netstandard2.1/YamlDotNet.dll" target="lib/netstandard2.1" />
<file src="bin/Release/netstandard2.1/YamlDotNet.pdb" target="lib/netstandard2.1" />
<file src="bin/Release/netstandard2.1/YamlDotNet.xml" target="lib/netstandard2.1" />

<file src="../README.md" target="" />
<file src="../LICENSE.txt" target="" />
<file src="../yamldotnet.png" target="images/" />
</files>
Expand Down
1 change: 1 addition & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,4 @@ artifacts:
name: Release-Net80

- path: YamlDotNet\bin\*.nupkg
- path: YamlDotNet\bin\*.snupkg
6 changes: 3 additions & 3 deletions tools/build/BuildDefinition.cs
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ public static Task<MetadataSet> SetMetadata(GitVersion version)
public static Task<SuccessfulBuild> Build(Options options, MetadataSet _)
{
var verbosity = options.Verbose ? "detailed" : "minimal";
Run("dotnet", $"build YamlDotNet.sln --configuration Release --verbosity {verbosity}", BasePath);
Run("dotnet", $"build YamlDotNet.sln --configuration Release --verbosity {verbosity} -p:ContinuousIntegrationBuild=true", BasePath);

return Task.FromResult(new SuccessfulBuild());
}
Expand All @@ -143,14 +143,14 @@ public static Task<List<NuGetPackage>> Pack(Options options, GitVersion version,
var result = new List<NuGetPackage>();
var verbosity = options.Verbose ? "detailed" : "minimal";
var buildDir = Path.Combine(BasePath, "YamlDotNet");
Run("nuget", $"pack YamlDotNet.nuspec -Version {version.NuGetVersion} -OutputDirectory bin", buildDir);
Run("nuget", $"pack YamlDotNet.nuspec -Version {version.NuGetVersion} -OutputDirectory bin -Symbols -SymbolPackageFormat snupkg", buildDir);
var packagePath = Path.Combine(buildDir, "bin", $"YamlDotNet.{version.NuGetVersion}.nupkg");
result.Add(new NuGetPackage(packagePath, "YamlDotNet"));

if (PushSerializer)
{
buildDir = Path.Combine(BasePath, "YamlDotNet.Analyzers.StaticGenerator");
Run("nuget", $"pack YamlDotNet.Analyzers.StaticGenerator.nuspec -Version {version.NuGetVersion} -OutputDirectory bin", buildDir);
Run("nuget", $"pack YamlDotNet.Analyzers.StaticGenerator.nuspec -Version {version.NuGetVersion} -OutputDirectory bin -Symbols -SymbolPackageFormat snupkg", buildDir);
packagePath = Path.Combine(buildDir, "bin", $"YamlDotNet.Analyzers.StaticGenerator.{version.NuGetVersion}.nupkg");
result.Add(new NuGetPackage(packagePath, "YamlDotNet.Analyzers.StaticGenerator"));
}
Expand Down