Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 4 additions & 4 deletions Benchmarks/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
<PackageVersion Include="ServiceModel.Grpc.MessagePackMarshaller" Version="$(ServiceModelGrpcVersion)" />
<PackageVersion Include="ServiceModel.Grpc.ProtoBufMarshaller" Version="$(ServiceModelGrpcVersion)" />

<PackageVersion Include="BenchmarkDotNet" Version="0.15.6" />
<PackageVersion Include="MagicOnion" Version="7.0.6" />
<PackageVersion Include="MagicOnion.Server" Version="7.0.6" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.0" />
<PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
<PackageVersion Include="MagicOnion" Version="7.0.8" />
<PackageVersion Include="MagicOnion.Server" Version="7.0.8" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.1" />
<PackageVersion Include="protobuf-net.Grpc" Version="1.2.2" />
<PackageVersion Include="protobuf-net.Grpc.AspNetCore" Version="1.2.2" />
<PackageVersion Include="System.ServiceModel.Primitives" Version="10.0.652802" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public MagicOnionCombinedCallTest(SomeObject payload)
})
.ConfigureEndpoints(endpoints =>
{
endpoints.MapMagicOnionService();
endpoints.MapMagicOnionService<TestServiceMagicOnionStub>();
});
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public MagicOnionServerCallTest(SomeObject payload)
})
.ConfigureEndpoints(endpoints =>
{
endpoints.MapMagicOnionService();
endpoints.MapMagicOnionService<TestServiceMagicOnionStub>();
});
}

Expand Down
2 changes: 1 addition & 1 deletion Build/third-party-libraries/configuration/appsettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"allowToUseLocalCache": true,
"downloadPackageIntoRepository": false,
"ignorePackages": {
"byName": ["ServiceModel\\.Grpc"],
"byName": ["ServiceModel\\.Grpc", "Microsoft\\.NET\\.ILLink\\.Tasks"],
"byProjectName": []
},
"internalPackages": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>Google.Protobuf</id>
<version>3.33.1</version>
<version>3.33.2</version>
<authors>Google Inc.</authors>
<license type="expression">BSD-3-Clause</license>
<licenseUrl>https://licenses.nuget.org/BSD-3-Clause</licenseUrl>
Expand All @@ -11,7 +11,7 @@
<releaseNotes>C# proto3 support</releaseNotes>
<copyright>Copyright 2015, Google Inc.</copyright>
<tags>Protocol Buffers Binary Serialization Format Google proto proto3</tags>
<repository type="git" url="https://github.com/protocolbuffers/protobuf.git" commit="a8d85ffbc7158660b4247f732371d1b07780510e" />
<repository type="git" url="https://github.com/protocolbuffers/protobuf.git" commit="7ccf2060af4cd13c44a8659d0999be6c7a98fcc1" />
<dependencies>
<group targetFramework=".NETFramework4.5">
<dependency id="System.Memory" version="4.5.3" exclude="Build,Analyzers" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Google.Protobuf [3.33.1](https://www.nuget.org/packages/Google.Protobuf/3.33.1)
Google.Protobuf [3.33.2](https://www.nuget.org/packages/Google.Protobuf/3.33.2)
--------------------

Used by: AspNetCore internal, AspNetCoreNSwag internal, AspNetCoreSwashbuckle internal
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"Dependencies": [
{
"Name": "Grpc.Net.Common",
"Version": "2.71.0"
"Version": "2.76.0"
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>Grpc.AspNetCore.Server</id>
<version>2.71.0</version>
<version>2.76.0</version>
<authors>The gRPC Authors</authors>
<license type="expression">Apache-2.0</license>
<licenseUrl>https://licenses.nuget.org/Apache-2.0</licenseUrl>
Expand All @@ -12,34 +12,28 @@
<description>gRPC support for ASP.NET Core</description>
<copyright>Copyright 2019 The gRPC Authors</copyright>
<tags>gRPC RPC HTTP/2 aspnetcore</tags>
<repository type="git" url="https://github.com/grpc/grpc-dotnet.git" commit="c2555f2951c56a23d6c57bae6970cdfd30c552a7" />
<repository type="git" url="https://github.com/grpc/grpc-dotnet.git" commit="c52862d2be28c252a20786e08b82c48edcbf7325" />
<dependencies>
<group targetFramework="net6.0">
<dependency id="Grpc.Net.Common" version="2.71.0" exclude="Build,Analyzers" />
</group>
<group targetFramework="net7.0">
<dependency id="Grpc.Net.Common" version="2.71.0" exclude="Build,Analyzers" />
</group>
<group targetFramework="net8.0">
<dependency id="Grpc.Net.Common" version="2.71.0" exclude="Build,Analyzers" />
<dependency id="Grpc.Net.Common" version="2.76.0" exclude="Build,Analyzers" />
</group>
<group targetFramework="net9.0">
<dependency id="Grpc.Net.Common" version="2.71.0" exclude="Build,Analyzers" />
<dependency id="Grpc.Net.Common" version="2.76.0" exclude="Build,Analyzers" />
</group>
<group targetFramework="net10.0">
<dependency id="Grpc.Net.Common" version="2.76.0" exclude="Build,Analyzers" />
</group>
</dependencies>
<frameworkReferences>
<group targetFramework="net6.0">
<frameworkReference name="Microsoft.AspNetCore.App" />
</group>
<group targetFramework="net7.0">
<frameworkReference name="Microsoft.AspNetCore.App" />
</group>
<group targetFramework="net8.0">
<frameworkReference name="Microsoft.AspNetCore.App" />
</group>
<group targetFramework="net9.0">
<frameworkReference name="Microsoft.AspNetCore.App" />
</group>
<group targetFramework="net10.0">
<frameworkReference name="Microsoft.AspNetCore.App" />
</group>
</frameworkReferences>
</metadata>
</package>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Grpc.AspNetCore.Server [2.71.0](https://www.nuget.org/packages/Grpc.AspNetCore.Server/2.71.0)
Grpc.AspNetCore.Server [2.76.0](https://www.nuget.org/packages/Grpc.AspNetCore.Server/2.76.0)
--------------------

Used by: AspNetCore
Expand All @@ -20,6 +20,6 @@ Dependencies 1

|Name|Version|
|----------|:----|
|[Grpc.Net.Common](../../../../packages/nuget.org/grpc.net.common/2.71.0)|2.71.0|
|[Grpc.Net.Common](../../../../packages/nuget.org/grpc.net.common/2.76.0)|2.76.0|

*This page was generated by a tool.*
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>Grpc.Core.Api</id>
<version>2.71.0</version>
<version>2.76.0</version>
<authors>The gRPC Authors</authors>
<license type="expression">Apache-2.0</license>
<licenseUrl>https://licenses.nuget.org/Apache-2.0</licenseUrl>
Expand All @@ -12,7 +12,7 @@
<description>gRPC C# Surface API</description>
<copyright>Copyright 2019 The gRPC Authors</copyright>
<tags>gRPC RPC HTTP/2</tags>
<repository type="git" url="https://github.com/grpc/grpc-dotnet.git" commit="c2555f2951c56a23d6c57bae6970cdfd30c552a7" />
<repository type="git" url="https://github.com/grpc/grpc-dotnet.git" commit="c52862d2be28c252a20786e08b82c48edcbf7325" />
<dependencies>
<group targetFramework=".NETFramework4.6.2">
<dependency id="System.Memory" version="4.5.3" exclude="Build,Analyzers" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Grpc.Core.Api [2.71.0](https://www.nuget.org/packages/Grpc.Core.Api/2.71.0)
Grpc.Core.Api [2.76.0](https://www.nuget.org/packages/Grpc.Core.Api/2.76.0)
--------------------

Used by: AspNetCore, ClientDI, Core, DesignTime, SelfHost
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"Dependencies": [
{
"Name": "Grpc.Core.Api",
"Version": "2.71.0"
"Version": "2.76.0"
}
]
},
Expand All @@ -33,7 +33,7 @@
"Dependencies": [
{
"Name": "Grpc.Core.Api",
"Version": "2.71.0"
"Version": "2.76.0"
},
{
"Name": "System.Memory",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Dependencies 2

|Name|Version|
|----------|:----|
|[Grpc.Core.Api](../../../../packages/nuget.org/grpc.core.api/2.71.0)|2.71.0|
|[Grpc.Core.Api](../../../../packages/nuget.org/grpc.core.api/2.76.0)|2.76.0|
|[System.Memory](../../../../packages/nuget.org/system.memory/4.5.3)|4.5.3|

*This page was generated by a tool.*
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
"Dependencies": [
{
"Name": "Grpc.Net.Common",
"Version": "2.71.0"
"Version": "2.76.0"
},
{
"Name": "Microsoft.Extensions.Logging.Abstractions",
"Version": "6.0.0"
"Version": "8.0.0"
}
]
},
Expand All @@ -39,11 +39,11 @@
"Dependencies": [
{
"Name": "Grpc.Net.Common",
"Version": "2.71.0"
"Version": "2.76.0"
},
{
"Name": "Microsoft.Extensions.Logging.Abstractions",
"Version": "6.0.0"
"Version": "8.0.0"
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>Grpc.Net.Client</id>
<version>2.71.0</version>
<version>2.76.0</version>
<authors>The gRPC Authors</authors>
<license type="expression">Apache-2.0</license>
<licenseUrl>https://licenses.nuget.org/Apache-2.0</licenseUrl>
Expand All @@ -12,34 +12,34 @@
<description>.NET client for gRPC</description>
<copyright>Copyright 2019 The gRPC Authors</copyright>
<tags>gRPC RPC HTTP/2</tags>
<repository type="git" url="https://github.com/grpc/grpc-dotnet.git" commit="c2555f2951c56a23d6c57bae6970cdfd30c552a7" />
<repository type="git" url="https://github.com/grpc/grpc-dotnet.git" commit="c52862d2be28c252a20786e08b82c48edcbf7325" />
<dependencies>
<group targetFramework=".NETFramework4.6.2">
<dependency id="Grpc.Net.Common" version="2.71.0" exclude="Build,Analyzers" />
<dependency id="Microsoft.Extensions.Logging.Abstractions" version="6.0.0" exclude="Build,Analyzers" />
<dependency id="Grpc.Net.Common" version="2.76.0" exclude="Build,Analyzers" />
<dependency id="Microsoft.Extensions.Logging.Abstractions" version="8.0.0" exclude="Build,Analyzers" />
<dependency id="System.Diagnostics.DiagnosticSource" version="6.0.1" exclude="Build,Analyzers" />
<dependency id="System.Net.Http.WinHttpHandler" version="8.0.0" exclude="Build,Analyzers" />
<dependency id="System.Net.Http.WinHttpHandler" version="8.0.3" exclude="Build,Analyzers" />
</group>
<group targetFramework="net6.0">
<dependency id="Grpc.Net.Common" version="2.71.0" exclude="Build,Analyzers" />
<dependency id="Microsoft.Extensions.Logging.Abstractions" version="6.0.0" exclude="Build,Analyzers" />
<group targetFramework="net8.0">
<dependency id="Grpc.Net.Common" version="2.76.0" exclude="Build,Analyzers" />
<dependency id="Microsoft.Extensions.Logging.Abstractions" version="8.0.0" exclude="Build,Analyzers" />
</group>
<group targetFramework="net7.0">
<dependency id="Grpc.Net.Common" version="2.71.0" exclude="Build,Analyzers" />
<dependency id="Microsoft.Extensions.Logging.Abstractions" version="6.0.0" exclude="Build,Analyzers" />
<group targetFramework="net9.0">
<dependency id="Grpc.Net.Common" version="2.76.0" exclude="Build,Analyzers" />
<dependency id="Microsoft.Extensions.Logging.Abstractions" version="8.0.0" exclude="Build,Analyzers" />
</group>
<group targetFramework="net8.0">
<dependency id="Grpc.Net.Common" version="2.71.0" exclude="Build,Analyzers" />
<dependency id="Microsoft.Extensions.Logging.Abstractions" version="6.0.0" exclude="Build,Analyzers" />
<group targetFramework="net10.0">
<dependency id="Grpc.Net.Common" version="2.76.0" exclude="Build,Analyzers" />
<dependency id="Microsoft.Extensions.Logging.Abstractions" version="8.0.0" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="Grpc.Net.Common" version="2.71.0" exclude="Build,Analyzers" />
<dependency id="Microsoft.Extensions.Logging.Abstractions" version="6.0.0" exclude="Build,Analyzers" />
<dependency id="Grpc.Net.Common" version="2.76.0" exclude="Build,Analyzers" />
<dependency id="Microsoft.Extensions.Logging.Abstractions" version="8.0.0" exclude="Build,Analyzers" />
<dependency id="System.Diagnostics.DiagnosticSource" version="6.0.1" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETStandard2.1">
<dependency id="Grpc.Net.Common" version="2.71.0" exclude="Build,Analyzers" />
<dependency id="Microsoft.Extensions.Logging.Abstractions" version="6.0.0" exclude="Build,Analyzers" />
<dependency id="Grpc.Net.Common" version="2.76.0" exclude="Build,Analyzers" />
<dependency id="Microsoft.Extensions.Logging.Abstractions" version="8.0.0" exclude="Build,Analyzers" />
<dependency id="System.Diagnostics.DiagnosticSource" version="6.0.1" exclude="Build,Analyzers" />
</group>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Grpc.Net.Client [2.71.0](https://www.nuget.org/packages/Grpc.Net.Client/2.71.0)
Grpc.Net.Client [2.76.0](https://www.nuget.org/packages/Grpc.Net.Client/2.76.0)
--------------------

Used by: ClientDI, Core internal
Expand All @@ -20,7 +20,7 @@ Dependencies 2

|Name|Version|
|----------|:----|
|[Grpc.Net.Common](../../../../packages/nuget.org/grpc.net.common/2.71.0)|2.71.0|
|[Microsoft.Extensions.Logging.Abstractions](../../../../packages/nuget.org/microsoft.extensions.logging.abstractions/6.0.0)|6.0.0|
|[Grpc.Net.Common](../../../../packages/nuget.org/grpc.net.common/2.76.0)|2.76.0|
|[Microsoft.Extensions.Logging.Abstractions](../../../../packages/nuget.org/microsoft.extensions.logging.abstractions/8.0.0)|8.0.0|

*This page was generated by a tool.*
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
"Dependencies": [
{
"Name": "Grpc.Net.Client",
"Version": "2.71.0"
"Version": "2.76.0"
},
{
"Name": "Microsoft.Extensions.Http",
"Version": "6.0.0"
"Version": "8.0.0"
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>Grpc.Net.ClientFactory</id>
<version>2.71.0</version>
<version>2.76.0</version>
<authors>The gRPC Authors</authors>
<license type="expression">Apache-2.0</license>
<licenseUrl>https://licenses.nuget.org/Apache-2.0</licenseUrl>
Expand All @@ -12,27 +12,27 @@
<description>HttpClientFactory integration the for gRPC .NET client</description>
<copyright>Copyright 2019 The gRPC Authors</copyright>
<tags>gRPC RPC HTTP/2</tags>
<repository type="git" url="https://github.com/grpc/grpc-dotnet.git" commit="c2555f2951c56a23d6c57bae6970cdfd30c552a7" />
<repository type="git" url="https://github.com/grpc/grpc-dotnet.git" commit="c52862d2be28c252a20786e08b82c48edcbf7325" />
<dependencies>
<group targetFramework="net6.0">
<dependency id="Grpc.Net.Client" version="2.71.0" include="All" />
<dependency id="Microsoft.Extensions.Http" version="6.0.0" exclude="Build,Analyzers" />
<group targetFramework="net8.0">
<dependency id="Grpc.Net.Client" version="2.76.0" include="All" />
<dependency id="Microsoft.Extensions.Http" version="8.0.0" exclude="Build,Analyzers" />
</group>
<group targetFramework="net7.0">
<dependency id="Grpc.Net.Client" version="2.71.0" include="All" />
<dependency id="Microsoft.Extensions.Http" version="6.0.0" exclude="Build,Analyzers" />
<group targetFramework="net9.0">
<dependency id="Grpc.Net.Client" version="2.76.0" include="All" />
<dependency id="Microsoft.Extensions.Http" version="8.0.0" exclude="Build,Analyzers" />
</group>
<group targetFramework="net8.0">
<dependency id="Grpc.Net.Client" version="2.71.0" include="All" />
<dependency id="Microsoft.Extensions.Http" version="6.0.0" exclude="Build,Analyzers" />
<group targetFramework="net10.0">
<dependency id="Grpc.Net.Client" version="2.76.0" include="All" />
<dependency id="Microsoft.Extensions.Http" version="8.0.0" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETStandard2.0">
<dependency id="Grpc.Net.Client" version="2.71.0" include="All" />
<dependency id="Microsoft.Extensions.Http" version="6.0.0" exclude="Build,Analyzers" />
<dependency id="Grpc.Net.Client" version="2.76.0" include="All" />
<dependency id="Microsoft.Extensions.Http" version="8.0.0" exclude="Build,Analyzers" />
</group>
<group targetFramework=".NETStandard2.1">
<dependency id="Grpc.Net.Client" version="2.71.0" include="All" />
<dependency id="Microsoft.Extensions.Http" version="6.0.0" exclude="Build,Analyzers" />
<dependency id="Grpc.Net.Client" version="2.76.0" include="All" />
<dependency id="Microsoft.Extensions.Http" version="8.0.0" exclude="Build,Analyzers" />
</group>
</dependencies>
</metadata>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Grpc.Net.ClientFactory [2.71.0](https://www.nuget.org/packages/Grpc.Net.ClientFactory/2.71.0)
Grpc.Net.ClientFactory [2.76.0](https://www.nuget.org/packages/Grpc.Net.ClientFactory/2.76.0)
--------------------

Used by: ClientDI
Expand All @@ -20,7 +20,7 @@ Dependencies 2

|Name|Version|
|----------|:----|
|[Grpc.Net.Client](../../../../packages/nuget.org/grpc.net.client/2.71.0)|2.71.0|
|[Microsoft.Extensions.Http](../../../../packages/nuget.org/microsoft.extensions.http/6.0.0)|6.0.0|
|[Grpc.Net.Client](../../../../packages/nuget.org/grpc.net.client/2.76.0)|2.76.0|
|[Microsoft.Extensions.Http](../../../../packages/nuget.org/microsoft.extensions.http/8.0.0)|8.0.0|

*This page was generated by a tool.*
Loading