Skip to content

Commit 67fb7ba

Browse files
committed
Refactor Asn1 dependency
1 parent d508cfb commit 67fb7ba

File tree

5 files changed

+9
-6
lines changed

5 files changed

+9
-6
lines changed

eng/SourceBuildPrebuiltBaseline.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<UsagePattern IdentityGlob="System.Composition.TypedParts/*8.0.0*" />
2020
<UsagePattern IdentityGlob="System.Security.Cryptography.Pkcs/5.0.*" />
2121
<UsagePattern IdentityGlob="System.Security.Cryptography.Pkcs/6.0.*" />
22-
<UsagePattern IdentityGlob="System.Formats.Asn1/8.0.*" />
2322

2423
<!-- These are what the analyzers are built against. They are overridden in full source build.
2524
It may be possible to generate SBRPs -->

eng/Version.Details.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,10 @@
206206
<Uri>https://github.com/dotnet/runtime</Uri>
207207
<Sha>040cbe276907174316e2cc07b35814b3069874a6</Sha>
208208
</Dependency>
209+
<Dependency Name="System.Formats.Asn1" Version="10.0.0-alpha.1.24617.3">
210+
<Uri>https://github.com/dotnet/runtime</Uri>
211+
<Sha>040cbe276907174316e2cc07b35814b3069874a6</Sha>
212+
</Dependency>
209213
<Dependency Name="System.IO.Pipelines" Version="10.0.0-alpha.1.24617.3">
210214
<Uri>https://github.com/dotnet/runtime</Uri>
211215
<Sha>040cbe276907174316e2cc07b35814b3069874a6</Sha>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@
208208
<MicrosoftExtensionsDiagnosticAdapterVersion>5.0.0-preview.3.20215.2</MicrosoftExtensionsDiagnosticAdapterVersion>
209209
<!-- Build tool dependencies -->
210210
<MicrosoftVSSDKBuildToolsVersion>15.9.3032</MicrosoftVSSDKBuildToolsVersion>
211-
<RepoTasksSystemFormatsAsn1Version>8.0.1</RepoTasksSystemFormatsAsn1Version>
211+
<SystemFormatsAsn1Version>10.0.0-alpha.1.24617.3</SystemFormatsAsn1Version>
212212
<!-- Stable dotnet/corefx packages no longer updated for .NET Core 3 -->
213213
<MicrosoftCSharpVersion>4.7.0</MicrosoftCSharpVersion>
214214
<MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
@@ -256,7 +256,7 @@
256256
-->
257257
<Analyzer_MicrosoftCodeAnalysisCSharpVersion>3.3.1</Analyzer_MicrosoftCodeAnalysisCSharpVersion>
258258
<Analyzer_MicrosoftCodeAnalysisCSharpWorkspacesVersion>3.3.1</Analyzer_MicrosoftCodeAnalysisCSharpWorkspacesVersion>
259-
<!-- Pin the version of the M.CA dependencies that we utilize with a cutom version property $(MicrosoftCodeAnalysisVersion_LatestVS) to avoid automatically
259+
<!-- Pin the version of the M.CA dependencies that we utilize with a custom version property $(MicrosoftCodeAnalysisVersion_LatestVS) to avoid automatically
260260
consuming the newest version of the packages when using the $(MicrosoftCodeAnalysisCSharpVersion) properties in source-build. -->
261261
<MicrosoftCodeAnalysisVersion_LatestVS>4.13.0-3.24613.7</MicrosoftCodeAnalysisVersion_LatestVS>
262262
<MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>4.13.0-3.24613.7</MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>

eng/tools/RepoTasks/RepoTasks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" />
3737
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" />
3838
<!-- Manually updated version to address CVE-2024-38095 -->
39-
<PackageReference Include="System.Formats.Asn1" Version="$(RepoTasksSystemFormatsAsn1Version)" />
39+
<PackageReference Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
4040
</ItemGroup>
4141

4242
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.en.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
"symbols/InteractivityPlatform/choices/WebAssembly/description": "Runs in the browser using WebAssembly",
2222
"symbols/InteractivityPlatform/choices/Auto/displayName": "Auto (Server and WebAssembly)",
2323
"symbols/InteractivityPlatform/choices/Auto/description": "Uses Server while downloading WebAssembly assets, then uses WebAssembly",
24-
"symbols/InteractivityLocation/displayName": "_Interactivity location",
24+
"symbols/InteractivityLocation/displayName": "Interactivity _location",
2525
"symbols/InteractivityLocation/description": "Chooses which components will have interactive rendering enabled",
2626
"symbols/InteractivityLocation/choices/InteractivePerPage/displayName": "Per page/component",
2727
"symbols/InteractivityLocation/choices/InteractivePerPage/description": "Interactivity is applied on a per-page or per-component basis",
2828
"symbols/InteractivityLocation/choices/InteractiveGlobal/displayName": "Global",
2929
"symbols/InteractivityLocation/choices/InteractiveGlobal/description": "Interactivity is applied at the root level",
30-
"symbols/IncludeSampleContent/displayName": "_Include sample pages",
30+
"symbols/IncludeSampleContent/displayName": "Include _sample pages",
3131
"symbols/IncludeSampleContent/description": "Configures whether to add sample pages and styling to demonstrate basic usage patterns.",
3232
"symbols/Empty/description": "Configures whether to omit sample pages and styling that demonstrate basic usage patterns.",
3333
"symbols/auth/choices/None/description": "No authentication",

0 commit comments

Comments
 (0)