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.

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

Jump to bottom

Enable Github sourcelink #2148

Merged
merged 12 commits into from
Nov 10, 2020
Merged

Enable Github sourcelink #2148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6707f22
Enable Github sourcelink
eddynaka Nov 9, 2020
d077212
adding deterministic
eddynaka Nov 9, 2020
9c0c3e4
updating buildprops
eddynaka Nov 9, 2020
20bf46e
fixing
eddynaka Nov 9, 2020
40c1284
testing nuspec
eddynaka Nov 9, 2020
0cfd9f9
trying to fix base path
eddynaka Nov 10, 2020
de925b2
changing to reporoot
eddynaka Nov 10, 2020
308e519
rollback changes
eddynaka Nov 10, 2020
905d662
Merge branch 'master' into users/ednakamu/enabling-github-sourcelink
eddynaka Nov 10, 2020
e15c1cf
removing unstable bypass
eddynaka Nov 10, 2020
87afad2
updating ado-build script
eddynaka Nov 10, 2020
0cbbdd6
removing property from sarif.csproj and updating releasehistory
eddynaka Nov 10, 2020
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
2 changes: 1 addition & 1 deletion ado-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pr:
- '*'
- 'master'

pool:
vmImage: 'windows-latest'
Expand Down
1 change: 1 addition & 0 deletions src/ReleaseHistory.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

* FEATURE: PACKAGE BREAKING: Upgrade from .NET Framework 4.5 to .NET Framework 4.5.2 [#2135](https://github.com/microsoft/sarif-sdk/pull/2135)
* FEATURE: Multitool SARIF merge accepts `threads` parameter [#2026](https://github.com/microsoft/sarif-sdk/pull/2026)
* FEATURE: Enable GitHub SourceLink to SDK project [#2148](https://github.com/microsoft/sarif-sdk/pull/2148)

## **v2.3.7** [Sdk](https://www.nuget.org/packages/Sarif.Sdk/2.3.7) | [Driver](https://www.nuget.org/packages/Sarif.Driver/2.3.7) | [Converters](https://www.nuget.org/packages/Sarif.Converters/2.3.7) | [Multitool](https://www.nuget.org/packages/Sarif.Multitool/2.3.7) | [Multitool Library](https://www.nuget.org/packages/Sarif.Multitool.Library/2.3.7)
* DEPENDENCY BREAKING: SARIF now requires Newtonsoft.JSON 11.0.2 (rather than 10.0.3)
Expand Down
2 changes: 1 addition & 1 deletion src/Sarif/Sarif.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
<PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
</ItemGroup>

<ItemGroup>
Expand Down Expand Up @@ -96,5 +97,4 @@

<Import Project="ToDotNet\ToDotNet.targets" />

<ProjectExtensions><VisualStudio><UserProperties CodeGenHints_1json__JSONSchema="http://json.schemastore.org/asmdef" /></VisualStudio></ProjectExtensions>
</Project>
27 changes: 22 additions & 5 deletions src/build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<Company Condition=" '$(Company)' == '' ">Microsoft</Company>
<Product Condition=" '$(Product)' == '' ">Microsoft SARIF SDK</Product>
<Copyright Condition=" '$(Copyright)' == '' ">© Microsoft Corporation. All rights reserved.</Copyright>

<!--
VersionPrefix denotes the current version of the SDK. You must update it before every nuget drop.

Expand All @@ -24,9 +24,9 @@
<VersionPrefix>2.3.8</VersionPrefix>
<PreviousVersionPrefix>2.3.7</PreviousVersionPrefix>

<!-- SchemaVersionAsPublishedToSchemaStoreOrg identifies the current published version on json schema store at https://schemastore.azurewebsites.net/schemas/json/ -->
<!-- SchemaVersionAsPublishedToSchemaStoreOrg identifies the current published version on json schema store at https://schemastore.azurewebsites.net/schemas/json/ -->
<SchemaVersionAsPublishedToSchemaStoreOrg>2.1.0-rtm.5</SchemaVersionAsPublishedToSchemaStoreOrg>

<!-- The stable version of the SARIF specification. -->
<StableSarifVersion>2.1.0</StableSarifVersion>

Expand All @@ -48,7 +48,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<HighEntropyVA>true</HighEntropyVA>
<HighEntropyVA>true</HighEntropyVA>
<!-- The line causes the assemblies in a project's referenced NuGet packages to be
copied to the output directory. If we omit it from a test project, the tests
fail on AppVeyor (and only there, for some reason).
Expand All @@ -64,7 +64,7 @@
<DefineConstants>DEBUG;TRACE;CODE_ANALYSIS</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' "
Label="Release build">
Label="Release build">
<DebugType>portable</DebugType>
<Optimize>true</Optimize>
<DefineConstants>TRACE</DefineConstants>
Expand Down Expand Up @@ -96,6 +96,13 @@
See https://github.com/NuGet/Home/issues/4687#issuecomment-393302779.
-->
<NoWarn>NU5105</NoWarn>

<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<IncludeSymbols>true</IncludeSymbols>
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>https://github.com/Microsoft/sarif-sdk</RepositoryUrl>
</PropertyGroup>

<ItemGroup>
Expand All @@ -106,4 +113,14 @@
<Compile Include="$(MsBuildThisFileDirectory)Shared\CommonAssemblyInfo.cs" />
</ItemGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
<TargetFrameworkMonikerAssemblyAttributesPath>$([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)'))</TargetFrameworkMonikerAssemblyAttributesPath>
<Deterministic>true</Deterministic>
</PropertyGroup>
<ItemGroup Condition=" '$(Configuration)' == 'Release' ">
<EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
<SourceRoot Include="$(MSBuildThisFileDirectory)/" />
</ItemGroup>

</Project>