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

Remove state Actor migration support #375

Draft
wants to merge 2 commits into
base: develop
Choose a base branch
from
Draft

Remove state Actor migration support #375

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
714677e
Remove KVS to RC migration projects
olegsych Jun 19, 2024
154af8b
Remove Microsoft.ServiceFabric.Actors.Migration namespace
olegsych Jun 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
33 changes: 0 additions & 33 deletions code.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ServiceFabric.Ser
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ServiceFabric.Services.Tests", "test\unittests\Microsoft.ServiceFabric.Services.Tests\Microsoft.ServiceFabric.Services.Tests.csproj", "{ECB3825D-B309-4C76-A20D-76544459F611}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ServiceFabric.Actors.KVSToRCMigration", "src\Microsoft.ServiceFabric.Actors.KVSToRCMigration\Microsoft.ServiceFabric.Actors.KVSToRCMigration.csproj", "{B5E3B9D7-E91E-4B76-959D-D418E973FCAF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ServiceFabric.Actors.KVSToRCMigration_netstandard", "src\netstandard\Microsoft.ServiceFabric.Actors.KVSToRCMigration\Microsoft.ServiceFabric.Actors.KVSToRCMigration_netstandard.csproj", "{E5B52C61-66BE-4D71-88D2-E50F78011C72}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ServiceFabric.Actors.StateMigration.Tests", "test\unittests\Microsoft.ServiceFabric.Actors.StateMigration.Tests\Microsoft.ServiceFabric.Actors.StateMigration.Tests.csproj", "{1BDC4681-FDBA-4E55-A247-5F779627A4D7}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -162,30 +156,6 @@ Global
{ECB3825D-B309-4C76-A20D-76544459F611}.Release|Any CPU.Build.0 = Release|Any CPU
{ECB3825D-B309-4C76-A20D-76544459F611}.Release|x64.ActiveCfg = Release|x64
{ECB3825D-B309-4C76-A20D-76544459F611}.Release|x64.Build.0 = Release|x64
{B5E3B9D7-E91E-4B76-959D-D418E973FCAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B5E3B9D7-E91E-4B76-959D-D418E973FCAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B5E3B9D7-E91E-4B76-959D-D418E973FCAF}.Debug|x64.ActiveCfg = Debug|x64
{B5E3B9D7-E91E-4B76-959D-D418E973FCAF}.Debug|x64.Build.0 = Debug|x64
{B5E3B9D7-E91E-4B76-959D-D418E973FCAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B5E3B9D7-E91E-4B76-959D-D418E973FCAF}.Release|Any CPU.Build.0 = Release|Any CPU
{B5E3B9D7-E91E-4B76-959D-D418E973FCAF}.Release|x64.ActiveCfg = Release|x64
{B5E3B9D7-E91E-4B76-959D-D418E973FCAF}.Release|x64.Build.0 = Release|x64
{E5B52C61-66BE-4D71-88D2-E50F78011C72}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E5B52C61-66BE-4D71-88D2-E50F78011C72}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E5B52C61-66BE-4D71-88D2-E50F78011C72}.Debug|x64.ActiveCfg = Debug|x64
{E5B52C61-66BE-4D71-88D2-E50F78011C72}.Debug|x64.Build.0 = Debug|x64
{E5B52C61-66BE-4D71-88D2-E50F78011C72}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E5B52C61-66BE-4D71-88D2-E50F78011C72}.Release|Any CPU.Build.0 = Release|Any CPU
{E5B52C61-66BE-4D71-88D2-E50F78011C72}.Release|x64.ActiveCfg = Release|x64
{E5B52C61-66BE-4D71-88D2-E50F78011C72}.Release|x64.Build.0 = Release|x64
{1BDC4681-FDBA-4E55-A247-5F779627A4D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1BDC4681-FDBA-4E55-A247-5F779627A4D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1BDC4681-FDBA-4E55-A247-5F779627A4D7}.Debug|x64.ActiveCfg = Debug|x64
{1BDC4681-FDBA-4E55-A247-5F779627A4D7}.Debug|x64.Build.0 = Debug|x64
{1BDC4681-FDBA-4E55-A247-5F779627A4D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1BDC4681-FDBA-4E55-A247-5F779627A4D7}.Release|Any CPU.Build.0 = Release|Any CPU
{1BDC4681-FDBA-4E55-A247-5F779627A4D7}.Release|x64.ActiveCfg = Release|x64
{1BDC4681-FDBA-4E55-A247-5F779627A4D7}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -207,9 +177,6 @@ Global
{63B58D31-66BB-4879-B4F1-0969FA3F4464} = {BB93122C-21C5-4BB8-B385-74FC423D6027}
{AE4034AC-27BC-43B8-9176-068B4794E25E} = {BB93122C-21C5-4BB8-B385-74FC423D6027}
{ECB3825D-B309-4C76-A20D-76544459F611} = {BB93122C-21C5-4BB8-B385-74FC423D6027}
{B5E3B9D7-E91E-4B76-959D-D418E973FCAF} = {861D6F40-D3CE-46CF-B8AD-0215B9F38BE1}
{E5B52C61-66BE-4D71-88D2-E50F78011C72} = {8B80B63B-5107-4845-9F19-647CFA7911A3}
{1BDC4681-FDBA-4E55-A247-5F779627A4D7} = {BB93122C-21C5-4BB8-B385-74FC423D6027}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {8CC7D7F7-CBD9-428B-A190-7A4D56C920FE}
Expand Down
82 changes: 0 additions & 82 deletions ...viceFabric.Actors.KVSToRCMigration/Microsoft.ServiceFabric.Actors.KVSToRCMigration.nuproj
View file
Open in desktop

This file was deleted.

7 changes: 2 additions & 5 deletions properties/service_fabric_managed_netframework.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@
$(RepoRoot)src\Microsoft.ServiceFabric.Actors.Wcf\Microsoft.ServiceFabric.Actors.Wcf.csproj;
$(RepoRoot)src\Microsoft.ServiceFabric.Services\Microsoft.ServiceFabric.Services.csproj;
$(RepoRoot)src\Microsoft.ServiceFabric.Services.Remoting\Microsoft.ServiceFabric.Services.Remoting.csproj;
$(RepoRoot)src\Microsoft.ServiceFabric.Services.Wcf\\Microsoft.ServiceFabric.Services.Wcf.csproj;
$(RepoRoot)src\Microsoft.ServiceFabric.Actors.KVSToRCMigration\Microsoft.ServiceFabric.Actors.KVSToRCMigration.csproj" />
$(RepoRoot)src\Microsoft.ServiceFabric.Services.Wcf\\Microsoft.ServiceFabric.Services.Wcf.csproj;" />

<Projects_Test_netframework Include="$(RepoRoot)test\unittests\Microsoft.ServiceFabric.Actors.Tests\Microsoft.ServiceFabric.Actors.Tests.csproj;
$(RepoRoot)test\unittests\Microsoft.ServiceFabric.Services.Remoting.Tests\Microsoft.ServiceFabric.Services.Remoting.Tests.csproj;
$(RepoRoot)test\unittests\Microsoft.ServiceFabric.Services.Tests\Microsoft.ServiceFabric.Services.Tests.csproj;
$(RepoRoot)test\unittests\Microsoft.ServiceFabric.Actors.StateMigration.Tests\Microsoft.ServiceFabric.Actors.StateMigration.Tests.csproj" />
$(RepoRoot)test\unittests\Microsoft.ServiceFabric.Services.Tests\Microsoft.ServiceFabric.Services.Tests.csproj;" />

</ItemGroup>

Expand Down Expand Up @@ -59,7 +57,6 @@
<BinairesNetFramework Include="src\Microsoft.ServiceFabric.Services\$(OutputPath)Microsoft.ServiceFabric.Services.*"/>
<BinairesNetFramework Include="src\Microsoft.ServiceFabric.Services.Remoting\$(OutputPath)Microsoft.ServiceFabric.Services.Remoting.*"/>
<BinairesNetFramework Include="src\Microsoft.ServiceFabric.Services.Wcf\$(OutputPath)Microsoft.ServiceFabric.Services.Wcf.*"/>
<BinairesNetFramework Include="src\Microsoft.ServiceFabric.Actors.KVSToRCMigration\$(OutputPath)Microsoft.ServiceFabric.Actors.KVSToRCMigration.*"/>
</ItemGroup>
<Copy SourceFiles="@(BinairesNetFramework)" DestinationFiles="@(BinairesNetFramework->'$(DropFolderNetFramework)\%(Destination)\%(Filename)%(Extension)')" SkipUnchangedFiles="true" />
</Target>
Expand Down
4 changes: 1 addition & 3 deletions properties/service_fabric_managed_netstandard.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
<Projects_Prod_netstandard Include="$(RepoRoot)src\netstandard\FabActUtil\FabActUtil_netstandard.csproj;
$(RepoRoot)src\netstandard\Microsoft.ServiceFabric.Actors\Microsoft.ServiceFabric.Actors_netstandard.csproj;
$(RepoRoot)src\netstandard\Microsoft.ServiceFabric.Services\Microsoft.ServiceFabric.Services_netstandard.csproj;
$(RepoRoot)src\netstandard\Microsoft.ServiceFabric.Services.Remoting\Microsoft.ServiceFabric.Services.Remoting_netstandard.csproj;
$(RepoRoot)src\netstandard\Microsoft.ServiceFabric.Actors.KVSToRCMigration\Microsoft.ServiceFabric.Actors.KVSToRCMigration_netstandard.csproj;" />
$(RepoRoot)src\netstandard\Microsoft.ServiceFabric.Services.Remoting\Microsoft.ServiceFabric.Services.Remoting_netstandard.csproj;" />
</ItemGroup>

<Target Name="RestoreProd_netstandard">
Expand Down Expand Up @@ -37,7 +36,6 @@
<BinairesNetStandard Include="$(RepoRoot)src\netstandard\Microsoft.ServiceFabric.Services\$(OutputPath)Microsoft.ServiceFabric.Services.*"/>
<BinairesNetStandard Include="$(RepoRoot)src\netstandard\Microsoft.ServiceFabric.Services.Remoting\$(OutputPath)Microsoft.ServiceFabric.Services.Remoting.*"/>
<BinairesNetStandard Include="$(RepoRoot)src\netstandard\Microsoft.ServiceFabric.Services.Wcf\$(OutputPath)Microsoft.ServiceFabric.Services.Wcf.*"/>
<BinairesNetStandard Include="$(RepoRoot)src\netstandard\Microsoft.ServiceFabric.Actors.KVSToRCMigration\$(OutputPath)Microsoft.ServiceFabric.Actors.KVSToRCMigration.*"/>

<!-- Copy libs from referenced nuget packages to drop for nuget package creation -->
<BinairesNetStandard_Win Include="$(OutputPath)Publish\*.dll"/>
Expand Down
4 changes: 1 addition & 3 deletions properties/service_fabric_nuget.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
$(RepoRoot)nuprojs\Microsoft.ServiceFabric.Services\Microsoft.ServiceFabric.Services.nuproj;
$(RepoRoot)nuprojs\Microsoft.ServiceFabric.Services.Remoting\Microsoft.ServiceFabric.Services.Remoting.nuproj;
$(RepoRoot)nuprojs\Microsoft.ServiceFabric.Services.Wcf\\Microsoft.ServiceFabric.Services.Wcf.nuproj;
$(RepoRoot)nuprojs\SF.ActorsServices.Internal\SF.ActorsServices.Internal.nuproj;
$(RepoRoot)nuprojs\Microsoft.ServiceFabric.Actors.KVSToRCMigration\Microsoft.ServiceFabric.Actors.KVSToRCMigration.nuproj;"/>
$(RepoRoot)nuprojs\SF.ActorsServices.Internal\SF.ActorsServices.Internal.nuproj;"/>

<!-- List of packages.config to restore nuget packages -->
<PackagesConfigs Include="nuprojs\packages.config"/>
Expand All @@ -29,7 +28,6 @@
<Nupkgs Include="nuprojs\Microsoft.ServiceFabric.Services.Remoting\$(OutputPath)\Microsoft.ServiceFabric.Services.Remoting.*.nupkg"/>
<Nupkgs Include="nuprojs\Microsoft.ServiceFabric.Services.Wcf\$(OutputPath)\Microsoft.ServiceFabric.Services.Wcf.*.nupkg"/>
<Nupkgs Include="nuprojs\SF.ActorsServices.Internal\$(OutputPath)\SF.ActorsServices.Internal.*.nupkg"/>
<Nupkgs Include="nuprojs\Microsoft.ServiceFabric.Actors.KVSToRCMigration\$(OutputPath)\Microsoft.ServiceFabric.Actors.KVSToRCMigration.*.nupkg"/>
</ItemGroup>
<Copy SourceFiles="@(Nupkgs)" DestinationFiles="@(Nupkgs->'$(NugetPackageDropFolder)\%(Destination)\%(Filename)%(Extension)')" />
</Target>
Expand Down
81 changes: 0 additions & 81 deletions src/Microsoft.ServiceFabric.Actors.KVSToRCMigration/AmbiguousActorIdHandlerBase.cs
View file
Open in desktop

This file was deleted.

27 changes: 0 additions & 27 deletions src/Microsoft.ServiceFabric.Actors.KVSToRCMigration/CatchupPhaseWorkload.cs
View file
Open in desktop

This file was deleted.

Loading
Loading