Skip to content

Enable SourceLink and add back generated code #548

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.

Sign up for GitHub

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

Merged
merged 8 commits into from
Nov 6, 2018
Merged

Enable SourceLink and add back generated code #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
608fed3
Revert "Ignore generated code except Length, Information, Level (#517)"
angularsen Nov 3, 2018
5eacaf7
Add SourceLink to UnitsNet nuget
tmilnthorp Nov 2, 2018
2802372
Add SourceLink to JsonNet nuget
angularsen Nov 4, 2018
bd7ca36
Disable nuget symbols package
angularsen Nov 4, 2018
2b1150c
AppVeyor: Clone depth of 50 commits
angularsen Nov 3, 2018
79ff6d6
.gitattributes: Remove commented lines
angularsen Nov 4, 2018
40083cf
Mark .g.cs files as linguist-generated
angularsen Nov 4, 2018
a930640
Add SourceLink to WRC
angularsen Nov 4, 2018
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
22 changes: 2 additions & 20 deletions .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,27 +20,9 @@
*.filters text eol=crlf
*.vcxitems text eol=crlf


#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary

#*.xproj merge=binary
#*.props merge=binary
#*.filters merge=binary
#*.vcxitems merge=binary

# C#
*.cs diff=csharp
*.cs diff=csharp
*.g.cs linguist-generated
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might have to make this

**/*.g.cs linguist-generated=true

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Guess it's fine 😃


# Powershell
*.ps1 text eol=crlf
Expand Down
2 changes: 1 addition & 1 deletion Build/build-functions.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ function Start-PackNugets {
}

write-host -foreground yellow "WindowsRuntimeComponent project not yet supported by dotnet CLI, using nuget.exe instead"
& $nuget pack "$root\UnitsNet.WindowsRuntimeComponent\UnitsNet.WindowsRuntimeComponent.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir" -Symbols
& $nuget pack "$root\UnitsNet.WindowsRuntimeComponent\UnitsNet.WindowsRuntimeComponent.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir"

write-host -foreground blue "Pack nugets...END`n"
}
Expand Down
8 changes: 6 additions & 2 deletions UnitsNet.Serialization.JsonNet/UnitsNet.Serialization.JsonNet.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
<Title>Units.NET Serialization with Json.NET</Title>
<Description>A helper library for serializing and deserializing types in Units.NET using Json.NET.</Description>
<Copyright>Copyright (c) 2015 Andreas Gullberg Larsen</Copyright>
<IncludeSymbols>true</IncludeSymbols>
<IncludeSource>true</IncludeSource>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<RepositoryUrl>https://github.com/angularsen/UnitsNet</RepositoryUrl>
<PackageIconUrl>https://raw.githubusercontent.com/angularsen/UnitsNet/ce85185429be345d77eb2ce09c99d59cc9ab8aed/Docs/Images/logo-32.png</PackageIconUrl>
Expand All @@ -23,11 +21,17 @@
<TargetFrameworks>netstandard2.0;net40</TargetFrameworks>
<RootNamespace>UnitsNet.Serialization.JsonNet</RootNamespace>
<NoWarn>CS1701;CS1702;CS1705;CS0618</NoWarn>

<!-- SourceLink -->
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
</PropertyGroup>

<!-- NuGet references that work for both signed and unsigned -->
<ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="10.4.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63127-02" PrivateAssets="All"/>
<PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
</ItemGroup>

Expand Down
4 changes: 0 additions & 4 deletions UnitsNet.WindowsRuntimeComponent/GeneratedCode/Quantities/.gitignore
View file
Open in desktop

This file was deleted.

Loading