Skip to content

Commit fc5bb19

Browse files
authored
Remove net5 artifacts from remaining projects (#2408)
1 parent 68b55fc commit fc5bb19

File tree

11 files changed

+19
-15
lines changed

11 files changed

+19
-15
lines changed

benchmarks/RemoteBenchmark/Node1/Node1.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515
<ItemGroup>
1616
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
1717
</ItemGroup>
18-
<PropertyGroup Condition="'$(TargetFramework)' != 'net5.0'">
19-
<DefineConstants>NETCORE</DefineConstants>
18+
<PropertyGroup>
19+
<!-- Ensure NETCORE is defined for the .NET 8 build -->
20+
<DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
2021
</PropertyGroup>
2122
</Project>

benchmarks/RemoteBenchmark/Node1/context.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Primary node for remote benchmark harness.
66
_Parent context: [Remote Benchmark](../context.md)_
77

88
## Key Files
9-
* `Node1.csproj` – Project file configuring compilation targets and dependencies.
9+
* `Node1.csproj` – Project file configuring compilation targets and dependencies, now defining the `NETCORE` compilation constant for the .NET 8 build explicitly.
1010
* `Program.cs` – C# source defining Program behavior.
1111

1212
## Primary Types and Contracts

benchmarks/RemoteBenchmark/Node2/Node2.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
<ItemGroup>
1515
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
1616
</ItemGroup>
17-
<PropertyGroup Condition="'$(TargetFramework)' != 'net5.0'">
18-
<DefineConstants>NETCORE</DefineConstants>
17+
<PropertyGroup>
18+
<!-- Ensure NETCORE is defined for the .NET 8 build -->
19+
<DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
1920
</PropertyGroup>
2021
</Project>

benchmarks/RemoteBenchmark/Node2/context.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Secondary node for remote benchmark harness.
66
_Parent context: [Remote Benchmark](../context.md)_
77

88
## Key Files
9-
* `Node2.csproj` – Project file configuring compilation targets and dependencies.
9+
* `Node2.csproj` – Project file configuring compilation targets and dependencies, explicitly adding the `NETCORE` define for the .NET 8 target.
1010
* `Program.cs` – C# source defining Program behavior.
1111

1212
## Primary Types and Contracts

examples/cluster.aspnet-grains/Node1/Node1.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<Reference Include="StackExchange.Redis">
18-
<HintPath>..\..\..\..\..\..\.nuget\packages\stackexchange.redis\2.6.111\lib\net5.0\StackExchange.Redis.dll</HintPath>
19-
</Reference>
17+
<PackageReference Include="StackExchange.Redis" />
2018
</ItemGroup>
2119

2220
</Project>

examples/cluster.aspnet-grains/Node1/context.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Node1 directory within the Proto.Actor repository.
66
_Parent context: [Cluster Aspnet Grains](../context.md)_
77

88
## Key Files
9-
* `Node1.csproj` – Project file configuring compilation targets and dependencies.
9+
* `Node1.csproj` – Project file configuring compilation targets and dependencies, including a .NET 8 StackExchange.Redis package reference.
1010
* `Program.cs` – C# source defining Program behavior.
1111
* `appsettings.Development.json` – Configuration or metadata in JSON format.
1212
* `appsettings.json` – Configuration or metadata in JSON format.

examples/cluster.aspnet-grains/Node2/Node2.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<Reference Include="StackExchange.Redis" />
16+
<PackageReference Include="StackExchange.Redis" />
1717
</ItemGroup>
1818

1919
</Project>

examples/cluster.aspnet-grains/Node2/context.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ _Parent context: [Cluster Aspnet Grains](../context.md)_
77

88
## Key Files
99
* `HelloGrain.cs` – C# source defining Hello Grain behavior.
10-
* `Node2.csproj` – Project file configuring compilation targets and dependencies.
10+
* `Node2.csproj` – Project file configuring compilation targets and dependencies, pulling StackExchange.Redis through the .NET 8 package feed.
1111
* `Program.cs` – C# source defining Program behavior.
1212
* `appsettings.Development.json` – Configuration or metadata in JSON format.
1313
* `appsettings.json` – Configuration or metadata in JSON format.

logs/exceptions.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,6 @@ Proto.TestKit.TestKitException : Waited 1 seconds but failed to receive a messag
5858

5959
### Proto.Cluster.Tests.GossipCoreTests.Large_cluster_should_get_topology_consensus
6060
`Expected x.consensus to be True, but found False.` occurred twice before extending the consensus timeout to 20 seconds.
61+
62+
### Proto.Tests.SharedFutureTests.Should_wrap_request_ids_without_hitting_zero
63+
`Expected future.Pid.RequestId to be 8u, but found 1u.` observed when verifying request id wrap-around on .NET 8 after the upgrade; focused rerun and a full-suite retry passed.

tests/Proto.Remote.Tests/Proto.Remote.Tests.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
<ProjectReference Include="..\Proto.Remote.Tests.Messages\Proto.Remote.Tests.Messages.csproj" />
1212
<ProjectReference Include="..\..\src\Proto.TestKit\Proto.TestKit.csproj" />
1313
</ItemGroup>
14-
<PropertyGroup Condition="'$(TargetFramework)' != 'net5.0'">
15-
<DefineConstants>NETCORE</DefineConstants>
14+
<PropertyGroup>
15+
<!-- Ensure NETCORE is defined for the .NET 8 build -->
16+
<DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
1617
</PropertyGroup>
1718
</Project>

0 commit comments

Comments
 (0)