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

Newtonsoft and Layout Changes #142

Merged
merged 14 commits into from
Aug 9, 2022
Merged

Newtonsoft and Layout Changes #142

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
241b5e3
Added images for new SARIF contributor organizations.
marmegh Jun 30, 2022
db1a96d
Removed images for organizations no longer contributing.
marmegh Jun 30, 2022
5ee923c
Layout updates and added java-sarif link.
marmegh Jun 30, 2022
05ae231
logo update
marmegh Jun 30, 2022
eee40d9
Add Mend and Newtonsoft updates.
marmegh Jul 26, 2022
38aee7e
Update code owners.
marmegh Jul 26, 2022
ff29cdc
Update release history
marmegh Jul 26, 2022
32318da
Resolve merge conflicts
marmegh Jul 26, 2022
63ae1ff
Fix merge error
marmegh Jul 26, 2022
e0aef4a
Remove Eddy
marmegh Jul 26, 2022
e740e6a
PR feedback
marmegh Jul 27, 2022
66bf453
Add component governance check
marmegh Jul 27, 2022
94f9ba5
Update Sarif.Multitool to v3.0.0-beta1
marmegh Aug 4, 2022
cc46238
Added cfaucon as owner, too
marmegh Aug 4, 2022
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 .github/CODEOWNERS
View file
Open in desktop
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# This file controls who is tagged for review for any given pull request.

# For anything not explicitly taken by someone else:
* @eddynaka @michaelcfanning @EasyRhinoMSFT
* @michaelcfanning @EasyRhinoMSFT @marmegh
Copy link
Member

@michaelcfanning michaelcfanning Aug 4, 2022 •
edited by marmegh
Loading

Choose a reason for hiding this comment

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

michaelcfanning

might want to add cfaucon as a defensive measure. :) #Resolved

2 changes: 2 additions & 0 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ steps:
command: 'build'
projects: src/SarifWeb.sln
configuration: 'Release'

- task: ComponentGovernanceComponentDetection@0
3 changes: 3 additions & 0 deletions src/ReleaseHistory.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# SARIF Website Release History

## **v1.0.1**
- Updating contributors list/images, bump Sarif.Multitool.Library from 2.4.14 to 2.4.16, add link to java-sarif documentation. [#142](https://github.com/microsoft/sarif-website/pull/142)
Copy link
Member

Choose a reason for hiding this comment

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

contributors

Just curious, didn't we hear from Contrast Security that they'd be willing to be badged on the site?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Possibly, but to my knowledge they have not submitted the graphic for inclusion at this time. @EasyRhinoMSFT, have you heard from them at all?


## **v1.0.0**

- Add README and CONTRIBUTING files
Expand Down
10 changes: 5 additions & 5 deletions src/SarifWeb/SarifWeb.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
Expand All @@ -23,11 +23,11 @@
<ItemGroup>
<None Include="wwwroot\images\logos\GitHub.png" />
<None Include="wwwroot\images\logos\GrammaTech.png" />
<None Include="wwwroot\images\logos\KestrelTechnology.png" />
<None Include="wwwroot\images\logos\ForAllSecure.png" />
<None Include="wwwroot\images\logos\MicroFocus.png" />
<None Include="wwwroot\images\logos\Microsoft.png" />
<None Include="wwwroot\images\logos\SWAMP.png" />
<None Include="wwwroot\images\Nuget.png" />
<None Include="wwwroot\images\Sonar.png" />
<None Include="wwwroot\images\screenshots\VSCodeViewer.png" />
<None Include="wwwroot\images\screenshots\VSCodeViewer.thumbnail.png" />
<None Include="wwwroot\images\screenshots\VSViewer.png" />
Expand All @@ -42,8 +42,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.20.0" />
<PackageReference Include="Sarif.Multitool.Library" Version="2.4.14" />
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.21.0" />
<PackageReference Include="Sarif.Multitool.Library" Version="2.4.16" />
Copy link
Contributor Author

@marmegh marmegh Jul 26, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

@EasyRhinoMSFT, do we need something other than this to update the Multitool package? #Resolved

Copy link
Collaborator

Choose a reason for hiding this comment

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

Nope this should be it.
Note: using the Package Manager is the best way to go and ensures that everything is updated correctly.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Unfortunately, this approach doesn't work in most of the repos for this particular update. :(

Copy link
Collaborator

@EasyRhinoMSFT EasyRhinoMSFT Jul 27, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

What is the issue? I made the same change and it worked fine.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No issue, this thread started in a Teams chat. I think some of the context got lost.

</ItemGroup>

</Project>
35 changes: 21 additions & 14 deletions src/SarifWeb/Views/Home/Index.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
</div>
<div id="specSectionButtons">
<div id="specSectionButtons1">
<button id="specSectionButtonTutorials" role="button" href="https://github.com/microsoft/sarif-tutorials" target="_blank" class="content-button sarifweb-button gray-section">Study the tutorials</button>
<button id="specSectionButtonRead" role="button" href="https://docs.oasis-open.org/sarif/sarif/v2.1.0/" target="_blank" class="content-button sarifweb-button gray-section">Read the specification</button>
<button id="specSectionButtonTutorials" role="button" href="https://github.com/microsoft/sarif-tutorials" target="_blank" class="content-button sarifweb-button gray-section">Study the tutorials</button>
<button id="specSectionButtonAsk" role="button" href="https://github.com/oasis-tcs/sarif-spec/issues/new" target="_blank" class="content-button sarifweb-button gray-section">Ask a question</button>
</div>
<div id="specSectionButtons2">
Expand All @@ -56,8 +56,14 @@
The SARIF project is supported by a group of industry contributors.
</div>
<div id="collabSectionButtons" role="list" aria-labelledby="collabSectionTitle">
<a role="listitem" href="http://www.kestreltechnology.com" target="_blank">
<img aria-label="Kestrel Technology" src="~/Images/Logos/KestrelTechnology.png" alt="Kestrel Technology" />
<a href="https://www.sonarsource.com/" target="_blank">
<img role="listitem" aria-label="Sonar" src="~/Images/Logos/Sonar.png" alt="Sonar" />
</a>
<a href="https://forallsecure.com/" target="_blank">
<img role="listitem" aria-label="ForAllSecure" src="~/Images/Logos/ForAllSecure.png" alt="ForAllSecure" />
</a>
<a href="https://www.mend.io/" target="_blank">
<img role="listitem" aria-label="Mend" src="~/Images/Logos/Mend.png" alt="Mend" />
</a>
<a role="listitem" href="https://www.grammatech.com/" target="_blank">
<img aria-label="GrammaTech" src="~/Images/Logos/GrammaTech.png" alt="GrammaTech" />
Expand All @@ -71,9 +77,6 @@
<a role="listitem" href="https://github.com/features/security" target="_blank">
<img aria-label="GitHub, Inc." src="~/Images/Logos/GitHub.png" alt="GitHub, Inc." />
</a>
<a role="listitem" href="https://continuousassurance.org/" target="_blank">
<img aria-label="SWAMP" src="~/Images/Logos/SWAMP.png" alt="SWAMP" />
</a>
</div>
</section>

Expand Down Expand Up @@ -118,26 +121,26 @@
</button>
</div>
<div role="listitem">
<div class="tools-item-description"><b>Converters</b> - classes for converting the output of various static analysis tools to the SARIF format.</div>
<button id="toolsItemConvertersLink" role="button" aria-label="View SARIF Converters NuGet package" href="https://www.nuget.org/packages/Sarif.Converters/" target="_blank" class="tools-item-button sarifweb-button">
<div class="tools-item-description"><b>Multitool</b> - Multi-purpose command line tool for analyzing and manipulating SARIF files.</div>
<button id="toolsItemMultitoolLink" role="button" aria-label="View SARIF Multitool NuGet package" href="https://www.nuget.org/packages/Sarif.Multitool/" target="_blank" class="tools-item-button sarifweb-button">
<div class="tools-item-button-icon">
<img src="~/Images/Nuget.png" alt="NuGet" />
</div>
<div>View Package</div>
</button>
</div>
<div role="listitem">
<div class="tools-item-description"><b>Multitool</b> - Multi-purpose command line tool for analyzing and manipulating SARIF files.</div>
<button id="toolsItemMultitoolLink" role="button" aria-label="View SARIF Multitool NuGet package" href="https://www.nuget.org/packages/Sarif.Multitool/" target="_blank" class="tools-item-button sarifweb-button">
<div class="tools-item-description"><b>Interop</b> - Library that enables Visual Studio extensions to easily consume services exposed by the SARIF Viewer for VS.</div>
<button id="toolsItemInteropLink" role="button" aria-label="View SARIF Viewer interop library NuGet package" href="https://www.nuget.org/packages/Sarif.Viewer.VisualStudio.Interop/" target="_blank" class="tools-item-button sarifweb-button">
<div class="tools-item-button-icon">
<img src="~/Images/Nuget.png" alt="NuGet" />
</div>
<div>View Package</div>
</button>
</div>
<div role="listitem">
<div class="tools-item-description"><b>Interop</b> - Library that enables Visual Studio extensions to easily consume services exposed by the SARIF Viewer for VS.</div>
<button id="toolsItemInteropLink" role="button" aria-label="View SARIF Viewer interop library NuGet package" href="https://www.nuget.org/packages/Sarif.Viewer.VisualStudio.Interop/" target="_blank" class="tools-item-button sarifweb-button">
<div class="tools-item-description"><b>Converters</b> - classes for converting the output of various static analysis tools to the SARIF format.</div>
<button id="toolsItemConvertersLink" role="button" aria-label="View SARIF Converters NuGet package" href="https://www.nuget.org/packages/Sarif.Converters/" target="_blank" class="tools-item-button sarifweb-button">
<div class="tools-item-button-icon">
<img src="~/Images/Nuget.png" alt="NuGet" />
</div>
Expand All @@ -159,7 +162,9 @@
</svg>
</div>
</div>
<div class="tools-item-description tools-other-item-description"><a href="https://github.com/microsoft/sarif-js-sdk">Code and supporting files</a> for working with SARIF in JavaScript applications.</div>
<div class="tools-item-description tools-other-item-description">
<a href="https://github.com/microsoft/sarif-js-sdk">Code and supporting files</a> for working with SARIF in JavaScript applications.
</div>
</div>
<div role="listitem" aria-labelledby="toolsSectionPlatformLabelTypeScript">
<div class="tools-item-other-label">
Expand Down Expand Up @@ -187,7 +192,9 @@
</svg>
</div>
</div>
<div class="tools-item-description tools-other-item-description">Coming soon.</div>
<div class="tools-item-description tools-other-item-description">
<a href="https://github.com/Contrast-Security-OSS/java-sarif">POJOs</a> generated from the Static Analysis Results Interchange Format (SARIF) JSON schema for Java applications.
</div>
</div>
<div role="listitem" aria-labelledby="toolsSectionPlatformLabelPython">
<div class="tools-item-other-label">
Expand Down
Binary file added src/SarifWeb/wwwroot/images/logos/ForAllSecure.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/SarifWeb/wwwroot/images/logos/KestrelTechnology.png
View file
Open in desktop
Binary file not shown.
Binary file added src/SarifWeb/wwwroot/images/logos/Mend.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed src/SarifWeb/wwwroot/images/logos/SWAMP.png
View file
Open in desktop
Binary file not shown.
Binary file added src/SarifWeb/wwwroot/images/logos/Sonar.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.