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

Upgrade packages for .NET 9 builds #4092

Merged
merged 1 commit into from
Nov 13, 2024
Merged

Upgrade packages for .NET 9 builds #4092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion examples/protobuf/GenericHost/Server/Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<!-- Required for X509CertificateLoader with .NET 8-->
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.0-preview.*" />
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.*" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion examples/protobuf/Quic/Server/Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<!-- Required for X509CertificateLoader with .NET 8-->
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.0-preview.*" />
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.*" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion examples/protobuf/Secure/Server/Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<!-- Required for X509CertificateLoader with .NET 8-->
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.0-preview.*" />
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.*" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion examples/protobuf/TcpFallback/Server/Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<!-- Required for X509CertificateLoader with .NET 8-->
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.0-preview.*" />
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.*" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion examples/slice/GenericHost/Server/Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<!-- Required for X509CertificateLoader with .NET 8-->
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.0-preview.*" />
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.*" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion examples/slice/Quic/Server/Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<!-- Required for X509CertificateLoader with .NET 8-->
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.0-preview.*" />
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.*" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion examples/slice/Secure/Server/Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<!-- Required for X509CertificateLoader with .NET 8-->
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.0-preview.*" />
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.*" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion examples/slice/TcpFallback/Server/Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<!-- Required for X509CertificateLoader with .NET 8-->
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.0-preview.*" />
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.*" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/IceRpc.Templates/Templates/IceRpc-Protobuf-Client/IceRpc-Protobuf-Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
<!-- Required to avoid NuGet Audit error: see #4032 -->
<PackageReference Include="System.Text.Json" Version="8.0.*" />
<!-- Required for X509CertificateLoader with .NET 8-->
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.0-preview.*" />
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.*" />
<!--#else"-->
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.*-preview.*" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.*-preview.*" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.*" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.*" />
<!--#endif-->
<!-- The 1.2 beta version is required for supporting the latest language features.
See: https://github.com/DotNetAnalyzers/StyleCopAnalyzers/pull/3187 -->
Expand Down
4 changes: 2 additions & 2 deletions src/IceRpc.Templates/Templates/IceRpc-Protobuf-DI-Client/IceRpc-Protobuf-DI-Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<!-- Required to avoid NuGet Audit error: see #4032 -->
<PackageReference Include="System.Text.Json" Version="8.0.*" />
<!--#else-->
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.*-preview.*" />
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.*-preview.*" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.*" />
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.*" />
<!--#endif-->
<PackageReference Include="IceRpc.Protobuf.Tools" Version="0.5.0-preview1" PrivateAssets="All" />
<PackageReference Include="IceRpc.Protobuf" Version="0.5.0-preview1" />
Expand Down
4 changes: 2 additions & 2 deletions src/IceRpc.Templates/Templates/IceRpc-Protobuf-DI-Server/IceRpc-Protobuf-DI-Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<!-- Required to avoid NuGet Audit error: see #4032 -->
<PackageReference Include="System.Text.Json" Version="8.0.*" />
<!--#else-->
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.*-preview.*" />
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.*-preview.*" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.*" />
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.*" />
<!--#endif-->
<PackageReference Include="IceRpc.Protobuf.Tools" Version="0.5.0-preview1" PrivateAssets="All" />
<PackageReference Include="IceRpc.Protobuf" Version="0.5.0-preview1" />
Expand Down
6 changes: 3 additions & 3 deletions src/IceRpc.Templates/Templates/IceRpc-Protobuf-Server/IceRpc-Protobuf-Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
<!-- Required to avoid NuGet Audit error: see #4032 -->
<PackageReference Include="System.Text.Json" Version="8.0.*" />
<!-- Required for X509CertificateLoader with .NET 8-->
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.0-preview.*" />
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.*" />
<!--#else-->
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.*-preview.*" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.*-preview.*" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.*" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.*" />
<!--#endif-->
<!-- The 1.2 beta version is required for supporting the latest language features.
See: https://github.com/DotNetAnalyzers/StyleCopAnalyzers/pull/3187 -->
Expand Down
6 changes: 3 additions & 3 deletions src/IceRpc.Templates/Templates/IceRpc-Slice-Client/IceRpc-Slice-Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
<!-- Required to avoid NuGet Audit error: see #4032 -->
<PackageReference Include="System.Text.Json" Version="8.0.*" />
<!-- Required for X509CertificateLoader with .NET 8-->
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.0-preview.*" />
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.*" />
<!--#else-->
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.*-preview.*" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.*-preview.*" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.*" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.*" />
<!--#endif-->
<!-- The 1.2 beta version is required for supporting the latest language features.
See: https://github.com/DotNetAnalyzers/StyleCopAnalyzers/pull/3187 -->
Expand Down
4 changes: 2 additions & 2 deletions src/IceRpc.Templates/Templates/IceRpc-Slice-DI-Client/IceRpc-Slice-DI-Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<!-- Required to avoid NuGet Audit error: see #4032 -->
<PackageReference Include="System.Text.Json" Version="8.0.*" />
<!--#else-->
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.*-preview.*" />
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.*-preview.*" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.*" />
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.*" />
<!--#endif-->
<PackageReference Include="IceRpc.Slice.Tools" Version="0.5.0-preview1" PrivateAssets="All" />
<PackageReference Include="IceRpc.Slice" Version="0.5.0-preview1" />
Expand Down
4 changes: 2 additions & 2 deletions src/IceRpc.Templates/Templates/IceRpc-Slice-DI-Server/IceRpc-Slice-DI-Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<!-- Required to avoid NuGet Audit error: see #4032 -->
<PackageReference Include="System.Text.Json" Version="8.0.*" />
<!--#else-->
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.*-preview.*" />
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.*-preview.*" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.*" />
<PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.*" />
<!--#endif-->
<PackageReference Include="IceRpc.Slice.Tools" Version="0.5.0-preview1" PrivateAssets="All" />
<PackageReference Include="IceRpc.Slice" Version="0.5.0-preview1" />
Expand Down
6 changes: 3 additions & 3 deletions src/IceRpc.Templates/Templates/IceRpc-Slice-Server/IceRpc-Slice-Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
<!-- Required to avoid NuGet Audit error: see #4032 -->
<PackageReference Include="System.Text.Json" Version="8.0.*" />
<!-- Required for X509CertificateLoader with .NET 8-->
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.0-preview.*" />
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.*" />
<!--#else-->
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.*-preview.*" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.*-preview.*" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.*" />
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.*" />
<!--#endif-->
<!-- The 1.2 beta version is required for supporting the latest language features.
See: https://github.com/DotNetAnalyzers/StyleCopAnalyzers/pull/3187 -->
Expand Down
5 changes: 1 addition & 4 deletions tests/IceRpc.Conformance.Tests/IceRpc.Conformance.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.*" />
<!-- Required to avoid version conflicts: see #4088 -->
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.*" />
<PackageReference Include="NUnit.Analyzers" Version="4.3.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand All @@ -31,7 +28,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.0-preview.*" />
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.*" />
</ItemGroup>

<!-- NuGet package contents-->
Expand Down
3 changes: 0 additions & 3 deletions tests/IceRpc.Logger.Tests/IceRpc.Logger.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.*" />
<!-- Required to avoid version conflicts: see #4088 -->
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.*" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="NUnit.Analyzers" Version="4.3.0">
<PrivateAssets>all</PrivateAssets>
Expand Down
2 changes: 1 addition & 1 deletion tests/IceRpc.Quic.Tests/IceRpc.Quic.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.0-preview.*" />
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.*" />
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 0 additions & 3 deletions tests/IceRpc.Retry.Tests/IceRpc.Retry.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.*" />
<!-- Required to avoid version conflicts: see #4088 -->
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.*" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
<PackageReference Include="NUnit.Analyzers" Version="4.3.0">
<PrivateAssets>all</PrivateAssets>
Expand Down
2 changes: 1 addition & 1 deletion tests/IceRpc.Tests/IceRpc.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<ProjectReference Include="../IceRpc.Tests.Common/IceRpc.Tests.Common.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.0-preview.*" />
<PackageReference Include="Microsoft.Bcl.Cryptography" Version="9.0.*" />
</ItemGroup>
<ItemGroup>
<None Include="../../certs/*.p12">
Expand Down
Loading