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 tsa and policheck and bump STJ to 8.0.5 #10776

Merged
merged 5 commits into from
Oct 9, 2024
Merged

Enable tsa and policheck and bump STJ to 8.0.5 #10776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aa94be5
enable tsa and policheck
YuliiaKovalova Oct 9, 2024
eb28b8e
undo extra changes
YuliiaKovalova Oct 9, 2024
4ff3dbd
bump SystemTextJsonVersion
YuliiaKovalova Oct 9, 2024
bafe812
Merge branch 'dev/ykovalova/enable_tsa' of https://github.com/YuliiaK…
YuliiaKovalova Oct 9, 2024
44fa583
update binding redirects
YuliiaKovalova Oct 9, 2024
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
10 changes: 10 additions & 0 deletions .config/tsaoptions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"instanceUrl": "https://devdiv.visualstudio.com/",
"template": "TFSDEVDIV",
"projectName": "DEVDIV",
"areaPath": "DevDiv\\NET Tools\\MSBuild",
"iterationPath": "DevDiv",
"notificationAliases": [ "msbtm@microsoft.com" ],
"repositoryName": "MSBuild",
"codebaseName": "MSBuild"
}
4 changes: 4 additions & 0 deletions .vsts-dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ extends:
name: VSEngSS-MicroBuild2022-1ES
os: windows
sdl:
policheck:
enabled: true
tsa:
enabled: true
# We generate SBOM ourselves, so don't need steps injected by 1ES.
sbom:
enabled: false
Expand Down
2 changes: 1 addition & 1 deletion eng/SourceBuildPrebuiltBaseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<UsagePattern IdentityGlob="System.Security.Cryptography.Pkcs/*8.0.0*" />
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/*8.0.0*" />
<UsagePattern IdentityGlob="System.Security.Cryptography.Xml/*8.0.0*" />
<UsagePattern IdentityGlob="System.Text.Json/*8.0.4*" />
<UsagePattern IdentityGlob="System.Text.Json/*8.0.5*" />
<UsagePattern IdentityGlob="System.Threading.Tasks.Dataflow/*8.0.0*" />
</IgnorePatterns>
<Usages>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>
<SystemTextEncodingCodePagesVersion>7.0.0</SystemTextEncodingCodePagesVersion>
<SystemTextRegularExpressionsVersion>4.3.1</SystemTextRegularExpressionsVersion>
<SystemTextJsonVersion>8.0.4</SystemTextJsonVersion>
<SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
<SystemThreadingChannelsVersion>8.0.0</SystemThreadingChannelsVersion>
<SystemThreadingTasksDataflowVersion>8.0.0</SystemThreadingTasksDataflowVersion>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/MSBuild/app.amd64.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.4" newVersion="8.0.0.4" />
<codeBase version="8.0.0.4" href="..\System.Text.Json.dll"/>
<bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
<codeBase version="8.0.0.5" href="..\System.Text.Json.dll"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
Expand Down
2 changes: 1 addition & 1 deletion src/MSBuild/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.4" newVersion="8.0.0.4" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.5" newVersion="8.0.0.5" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Dataflow" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
Expand Down