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

[release/9.0] Update vulnerable packages #424

Merged
merged 2 commits into from
Dec 20, 2024
Merged

[release/9.0] Update vulnerable packages #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5a1bb0
Update vulnerable packages
MichaelSimons Dec 19, 2024
01765fb
Flow in latest SBRP
MichaelSimons Dec 19, 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
8 changes: 8 additions & 0 deletions eng/SourceBuildPrebuiltBaseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,13 @@

<UsageData>
<IgnorePatterns>
<!-- Transitive dependencies from the msbuild intermediate -->
<UsagePattern IdentityGlob="System.CodeDom/8.0.0" />
<UsagePattern IdentityGlob="System.Configuration.ConfigurationManager/8.0.0" />
<UsagePattern IdentityGlob="System.Diagnostics.EventLog/8.0.0" />
<UsagePattern IdentityGlob="System.Formats.Asn1/8.0.1" />
<UsagePattern IdentityGlob="System.Reflection.MetadataLoadContext/8.0.0" />
<UsagePattern IdentityGlob="System.Resources.Extensions/8.0.0" />
<UsagePattern IdentityGlob="System.Security.Cryptography.ProtectedData/8.0.0" />
</IgnorePatterns>
</UsageData>
14 changes: 12 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.Build" Version="17.12.18">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>ed8c6aec5b774cfdad4e95033910c30aa0d93391</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.msbuild" Version="17.12.18-preview-24610-04">
<Uri>https://github.com/dotnet/msbuild</Uri>
<Sha>ed8c6aec5b774cfdad4e95033910c30aa0d93391</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24572.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b41381d5cd633471265e9cd72e933a7048e03062</Sha>
Expand All @@ -12,9 +22,9 @@
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.24405.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="9.0.0-alpha.1.24619.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
<Sha>0d066e61a30c2599d0ced871ea45acf0e10571af</Sha>
<Sha>e2b1d16fd66540b3a5813ec0ac1fd166688c3e0a</Sha>
<SourceBuild RepoName="source-build-reference-packages" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
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 @@ -19,6 +19,6 @@
<XunitReleaseVersion>2.4.2</XunitReleaseVersion>
</PropertyGroup>
<PropertyGroup>
<MicrosoftBuildVersion>17.8.3</MicrosoftBuildVersion>
<MicrosoftBuildVersion>17.12.18</MicrosoftBuildVersion>
</PropertyGroup>
</Project>
6 changes: 4 additions & 2 deletions ...azure-activedirectory-identitymodel-extensions-for-dotnet/0001-fix-for-source-build.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,11 @@ index 1e6f60cc..3287409f 100644
<SystemMemoryVersion>4.5.5</SystemMemoryVersion>
- <SystemSecurityCryptographyCngVersion>4.5.0</SystemSecurityCryptographyCngVersion>
+ <SystemSecurityCryptographyCngVersion>5.0.0</SystemSecurityCryptographyCngVersion>
<SystemTextJson>8.0.4</SystemTextJson>
- <SystemTextJson>8.0.4</SystemTextJson>
+ <SystemTextJson>8.0.5</SystemTextJson>
</PropertyGroup>


</Project>
diff --git a/build/targets.props b/build/targets.props
index 6f92780d..1c48acfb 100644
--- a/build/targets.props
Expand Down
2 changes: 1 addition & 1 deletion repo-projects/docker-creds-provider.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<DockerCredsProviderReleaseVersion>2.2.1</DockerCredsProviderReleaseVersion>
<DockerCredsProviderReleaseVersion>2.2.4</DockerCredsProviderReleaseVersion>
</PropertyGroup>

<Import Project="docker-creds-provider.targets" />
Expand Down
1 change: 1 addition & 0 deletions repo-projects/docker-creds-provider.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />

<PropertyGroup>
<GlobalJsonFile>$(ProjectDirectory)/global.json</GlobalJsonFile>
<PackagesOutput>$(ProjectDirectory)/src/Valleysoft.DockerCredsProvider/bin/$(Configuration)/</PackagesOutput>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/docker-creds-provider
Open in desktop
Submodule docker-creds-provider updated 6 files
+7 −0 .github/renovate.json
+5 −9 .github/workflows/ci.yml
+4 −6 .github/workflows/release.yml
+7 −0 global.json
+5 −5 src/Valleysoft.DockerCredsProvider.Test/Valleysoft.DockerCredsProvider.Test.csproj
+1 −1 src/Valleysoft.DockerCredsProvider/Valleysoft.DockerCredsProvider.csproj