Skip to content

Commit c612cb7

Browse files
authored
Merge pull request #8626 from dotnet/merge/release/9.0.1xx-to-release/9.0.2xx
[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.2xx'
2 parents 32f5455 + 28e2faf commit c612cb7

File tree

4 files changed

+13
-7
lines changed

4 files changed

+13
-7
lines changed

azure-pipelines.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ extends:
5959
enabled: true
6060
tsa:
6161
enabled: true
62-
binskim:
63-
analyzeTargetGlob: +:f|**\*.dll;+:f|**\*.exe;
6462
stages:
6563
- stage: build
6664
displayName: Build
@@ -89,6 +87,14 @@ extends:
8987
enableInternalSources: true
9088
enableTelemetry: true
9189
helixRepo: dotnet/templating
90+
templateContext:
91+
sdl:
92+
binskim:
93+
analyzeTargetGlob: +:f|artifacts\bin\**\*.dll;+:f|artifacts\bin\**\*.exe;
94+
# WORKAROUND: BinSkim requires the folder exist prior to scanning.
95+
preSteps:
96+
- powershell: New-Item -ItemType Directory -Path $(Build.SourcesDirectory)/artifacts/bin -Force
97+
displayName: Create artifacts/bin directory
9298
jobs:
9399
- ${{ each config in parameters.buildConfigurations }}:
94100
- job: Windows_NT_${{ config.buildConfig }}

eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<UsageData>
55
<IgnorePatterns>
66
<!-- Lifted to live version in VMR. -->
7-
<UsagePattern IdentityGlob="System.Formats.Asn1/8.0.*" />
7+
<UsagePattern IdentityGlob="System.Formats.Asn1/9.0.*" />
88
</IgnorePatterns>
99
</UsageData>

eng/Version.Details.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
<Sha>e0e05154656254a735ebf19ffa5a37a8b915039b</Sha>
3030
<SourceBuild RepoName="arcade" ManagedOnly="true" />
3131
</Dependency>
32-
<Dependency Name="System.Formats.Asn1" Version="8.0.1">
33-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
34-
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
32+
<Dependency Name="System.Formats.Asn1" Version="9.0.0">
33+
<Uri>https://github.com/dotnet/runtime</Uri>
34+
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
3535
</Dependency>
3636
</ToolsetDependencies>
3737
</Dependencies>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
</PropertyGroup>
2020
<PropertyGroup>
2121
<!-- Non-maestro versions -->
22-
<SystemFormatsAsn1Version>8.0.1</SystemFormatsAsn1Version>
22+
<SystemFormatsAsn1Version>9.0.0</SystemFormatsAsn1Version>
2323
</PropertyGroup>
2424
</Project>

0 commit comments

Comments
 (0)