Skip to content

Commit

Permalink
[main] Update dependencies from dotnet/arcade (#5680)
Browse files Browse the repository at this point in the history
[main] Update dependencies from dotnet/arcade
  • Loading branch information
dotnet-maestro[bot] authored Nov 13, 2024
1 parent c4b6700 commit 8677140
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 24 deletions.
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24557.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24562.15">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>39290b60a9015b444a1762d67e26f0f187eb5cc2</Sha>
<Sha>e882d5925ca55013d5810ac51e36574a65c5da84</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.24557.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.24562.15">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>39290b60a9015b444a1762d67e26f0f187eb5cc2</Sha>
<Sha>e882d5925ca55013d5810ac51e36574a65c5da84</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24557.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24562.15">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>39290b60a9015b444a1762d67e26f0f187eb5cc2</Sha>
<Sha>e882d5925ca55013d5810ac51e36574a65c5da84</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24557.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.24562.15">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>39290b60a9015b444a1762d67e26f0f187eb5cc2</Sha>
<Sha>e882d5925ca55013d5810ac51e36574a65c5da84</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
15 changes: 3 additions & 12 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -18,36 +18,30 @@
</PropertyGroup>
<!-- Arcade dependencies -->
<PropertyGroup>
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.24557.1</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.24557.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.24557.1</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>10.0.0-beta.24562.15</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>10.0.0-beta.24562.15</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.24562.15</MicrosoftDotNetGenAPIPackageVersion>
</PropertyGroup>
<!-- Additional dependencies -->
<PropertyGroup>
<MicrosoftTargetingPackNETFrameworkv472PackageVersion>1.0.0</MicrosoftTargetingPackNETFrameworkv472PackageVersion>
</PropertyGroup>

<PropertyGroup>
<!-- Needed by Infrastructure.Common.csproj -->
<MicrosoftDotNetPlatformAbstractionsPackageVersion>3.1.6</MicrosoftDotNetPlatformAbstractionsPackageVersion>

<!-- Used by System.ServiceModel.* projects -->
<SystemSecurityPrincipalWindowsPackageVersion>5.0.0</SystemSecurityPrincipalWindowsPackageVersion>
<MicrosoftExtensionsObjectPoolPackageVersion>8.0.10</MicrosoftExtensionsObjectPoolPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>8.0.2</SystemSecurityCryptographyXmlPackageVersion>
<MicrosoftIdentityModelProtocolsWsTrustPackageVersion>6.8.0</MicrosoftIdentityModelProtocolsWsTrustPackageVersion>

<XunitStaFactPackageVersion>1.2.46-alpha</XunitStaFactPackageVersion>
<BouncyCastleCryptodllPackageVersion>1.8.1</BouncyCastleCryptodllPackageVersion>

<MicrosoftCrankEventSourcesPackageVersion>0.1.0-alpha.20501.1</MicrosoftCrankEventSourcesPackageVersion>
<SystemRuntimeSerializationPrimitivesPackageVersion>4.3.0</SystemRuntimeSerializationPrimitivesPackageVersion>
<NewtonsoftJsonPackageVersion>13.0.3</NewtonsoftJsonPackageVersion>
<SystemReflectionDispatchProxyPackageVersion>4.7.1</SystemReflectionDispatchProxyPackageVersion>

<!-- Used by System.ServiceModel.Shim to add the Syndication api's to the shim -->
<SystemServiceModelSyndicationPackageVersion>8.0.0</SystemServiceModelSyndicationPackageVersion>

<!-- There hasn't been an update of Microsoft.IdentityModel.Protocols.WsTrust since 6.8.0
All the Microsoft.IdentityModel.* transitive dependencies are out of date. Adding them
so that WCF doesn't get flagged for vulnerabilities. We wouldn't normally do this,
Expand All @@ -58,7 +52,6 @@
<!-- From WsTrust -> System.Xml.XmlDocument -> System.Xml.ReaderWriter -> System.Text.RegularExpressions -->
<SystemTextRegularExpressionsPackageVersion>4.3.1</SystemTextRegularExpressionsPackageVersion>
</PropertyGroup>

<!-- dotnet-svcutil-lib packages -->
<PropertyGroup>
<MicrosoftApplicationInsightsPackageVersion>2.20.0</MicrosoftApplicationInsightsPackageVersion>
Expand All @@ -68,7 +61,6 @@
<SystemReflectionEmitPackageVersion>4.7.0</SystemReflectionEmitPackageVersion>
<SystemReflectionEmitLightweightPackageVersion>4.7.0</SystemReflectionEmitLightweightPackageVersion>
<SystemRuntimeLoaderPackageVersion>4.3.0</SystemRuntimeLoaderPackageVersion>

<WCFClientPackageVersion Condition="'$(TargetFramework)' == 'net6.0'">6.2.0</WCFClientPackageVersion>
<!-- Change net8.0, net9.0, net10.0, netstandard2.0, and net462 to 8.1.0 once it's released -->
<WCFClientPackageVersion Condition="'$(TargetFramework)' == 'net8.0'">8.0.0</WCFClientPackageVersion>
Expand All @@ -82,7 +74,6 @@
<SystemServiceModelUnixDomainSocketPackageVersion>$(WCFClientPackageVersion)</SystemServiceModelUnixDomainSocketPackageVersion>
<SystemServiceModelFederationPackageVersion>$(WCFClientPackageVersion)</SystemServiceModelFederationPackageVersion>
</PropertyGroup>

<PropertyGroup>
<MicrosoftExtensionsCachingMemoryPackageVersion>6.0.2</MicrosoftExtensionsCachingMemoryPackageVersion>
<SystemFormatsAsn1PackageVersion>8.0.1</SystemFormatsAsn1PackageVersion>
Expand Down
6 changes: 3 additions & 3 deletions eng/common/native/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ case "$os" in
apt update

apt install -y build-essential gettext locales cmake llvm clang lld lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \
libssl-dev libkrb5-dev zlib1g-dev pigz
libssl-dev libkrb5-dev zlib1g-dev pigz cpio

localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8
elif [ "$ID" = "fedora" ]; then
dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-devel lttng-ust-devel pigz
dnf install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel zlib-devel lttng-ust-devel pigz cpio
elif [ "$ID" = "alpine" ]; then
apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev pigz
apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev zlib-dev openssl-dev pigz cpio
else
echo "Unsupported distro. distro: $ID"
exit 1
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"version": "9.0.100-rc.2.24474.11"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24557.1",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24562.15",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23409.5"
}
}

0 comments on commit 8677140

Please sign in to comment.