Skip to content
Draft
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
5 changes: 3 additions & 2 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.3" />
<PackageVersion Include="Microsoft.Extensions.Options.DataAnnotations" Version="9.0.3" />
<PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.3" />
<PackageVersion Include="Microsoft.ServiceFabric.AspNetCore.Kestrel" Version="7.1.2493" />
<PackageVersion Include="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="9.0.3" />
Expand Down Expand Up @@ -64,9 +65,9 @@
<PackageVersion Include="Microsoft.ServiceFabric.Client.Http" Version="5.0.1" />
<PackageVersion Include="Microsoft.ServiceFabric.Services" Version="7.1.2493" />
<PackageVersion Include="Microsoft.ServiceFabric.Services.Remoting" Version="7.1.2493" />
<PackageVersion Include="ServiceFabric.Mocks" Version="7.2.11" />
<PackageVersion Include="ServiceFabric.Mocks" Version="7.2.13" />
</ItemGroup>
<ItemGroup Label="Moq pinned to 4.20.72, Moq updates are reviewed and made manually.">
<PackageVersion Include="Moq" Version="4.20.72" />
</ItemGroup>
</Project>
</Project>
37 changes: 37 additions & 0 deletions Omex.sln
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Omex.Extensions.D
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Omex.Extensions.ServiceFabricGuest.Abstractions.UnitTests", "tests\ServiceFabricGuest.Abstractions.UnitTests\Microsoft.Omex.Extensions.ServiceFabricGuest.Abstractions.UnitTests.csproj", "{66F677BB-D314-4DA0-9173-6CA74E88AAF2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestProject4", "TestProject4\TestProject4.csproj", "{8CBDEA04-0AB4-4590-99AB-76E26A5C88BF}"
EndProject
Project("{A07B5EB6-E848-4116-A8D0-A826331D98C6}") = "ReplicaRole.TestApp", "ReplicaRole.TestApp\ReplicaRole.TestApp.sfproj", "{D22FC4FC-DDC0-41DC-943F-D9C278A92800}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReplicaTestApp", "ReplicaTestApp\ReplicaTestApp.csproj", "{9CD4643A-3D05-4C4A-B5A8-D86074355770}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -275,6 +281,34 @@ Global
{66F677BB-D314-4DA0-9173-6CA74E88AAF2}.Release|Any CPU.Build.0 = Release|Any CPU
{66F677BB-D314-4DA0-9173-6CA74E88AAF2}.Release|x64.ActiveCfg = Release|Any CPU
{66F677BB-D314-4DA0-9173-6CA74E88AAF2}.Release|x64.Build.0 = Release|Any CPU
{8CBDEA04-0AB4-4590-99AB-76E26A5C88BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8CBDEA04-0AB4-4590-99AB-76E26A5C88BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8CBDEA04-0AB4-4590-99AB-76E26A5C88BF}.Debug|x64.ActiveCfg = Debug|Any CPU
{8CBDEA04-0AB4-4590-99AB-76E26A5C88BF}.Debug|x64.Build.0 = Debug|Any CPU
{8CBDEA04-0AB4-4590-99AB-76E26A5C88BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8CBDEA04-0AB4-4590-99AB-76E26A5C88BF}.Release|Any CPU.Build.0 = Release|Any CPU
{8CBDEA04-0AB4-4590-99AB-76E26A5C88BF}.Release|x64.ActiveCfg = Release|Any CPU
{8CBDEA04-0AB4-4590-99AB-76E26A5C88BF}.Release|x64.Build.0 = Release|Any CPU
{D22FC4FC-DDC0-41DC-943F-D9C278A92800}.Debug|Any CPU.ActiveCfg = Debug|x64
{D22FC4FC-DDC0-41DC-943F-D9C278A92800}.Debug|Any CPU.Build.0 = Debug|x64
{D22FC4FC-DDC0-41DC-943F-D9C278A92800}.Debug|Any CPU.Deploy.0 = Debug|x64
{D22FC4FC-DDC0-41DC-943F-D9C278A92800}.Debug|x64.ActiveCfg = Debug|x64
{D22FC4FC-DDC0-41DC-943F-D9C278A92800}.Debug|x64.Build.0 = Debug|x64
{D22FC4FC-DDC0-41DC-943F-D9C278A92800}.Debug|x64.Deploy.0 = Debug|x64
{D22FC4FC-DDC0-41DC-943F-D9C278A92800}.Release|Any CPU.ActiveCfg = Release|x64
{D22FC4FC-DDC0-41DC-943F-D9C278A92800}.Release|Any CPU.Build.0 = Release|x64
{D22FC4FC-DDC0-41DC-943F-D9C278A92800}.Release|Any CPU.Deploy.0 = Release|x64
{D22FC4FC-DDC0-41DC-943F-D9C278A92800}.Release|x64.ActiveCfg = Release|x64
{D22FC4FC-DDC0-41DC-943F-D9C278A92800}.Release|x64.Build.0 = Release|x64
{D22FC4FC-DDC0-41DC-943F-D9C278A92800}.Release|x64.Deploy.0 = Release|x64
{9CD4643A-3D05-4C4A-B5A8-D86074355770}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9CD4643A-3D05-4C4A-B5A8-D86074355770}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9CD4643A-3D05-4C4A-B5A8-D86074355770}.Debug|x64.ActiveCfg = Debug|Any CPU
{9CD4643A-3D05-4C4A-B5A8-D86074355770}.Debug|x64.Build.0 = Debug|Any CPU
{9CD4643A-3D05-4C4A-B5A8-D86074355770}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9CD4643A-3D05-4C4A-B5A8-D86074355770}.Release|Any CPU.Build.0 = Release|Any CPU
{9CD4643A-3D05-4C4A-B5A8-D86074355770}.Release|x64.ActiveCfg = Release|Any CPU
{9CD4643A-3D05-4C4A-B5A8-D86074355770}.Release|x64.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -304,6 +338,9 @@ Global
{7FD8C746-9DB1-4B33-B4A6-95AF5FEF2CCD} = {3249ADDB-50EC-4C21-A8F0-65EF444662EE}
{43CE835D-5A71-4689-9297-942EF1233175} = {551C93F8-6E89-4954-8905-7F5AC7173285}
{66F677BB-D314-4DA0-9173-6CA74E88AAF2} = {551C93F8-6E89-4954-8905-7F5AC7173285}
{8CBDEA04-0AB4-4590-99AB-76E26A5C88BF} = {3249ADDB-50EC-4C21-A8F0-65EF444662EE}
{D22FC4FC-DDC0-41DC-943F-D9C278A92800} = {3249ADDB-50EC-4C21-A8F0-65EF444662EE}
{9CD4643A-3D05-4C4A-B5A8-D86074355770} = {3249ADDB-50EC-4C21-A8F0-65EF444662EE}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {E6FB7BCB-BF07-4F19-ACBA-457479D421BB}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<ApplicationManifest xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ApplicationTypeName="ReplicaRole.TestAppType" ApplicationTypeVersion="1.0.0" xmlns="http://schemas.microsoft.com/2011/01/fabric">
<Parameters>
<Parameter Name="ReplicaTestApp_ASPNETCORE_ENVIRONMENT" DefaultValue="" />
</Parameters>
<!-- Import the ServiceManifest from the ServicePackage. The ServiceManifestName and ServiceManifestVersion
should match the Name and Version attributes of the ServiceManifest element defined in the
ServiceManifest.xml file. -->
<ServiceManifestImport>
<ServiceManifestRef ServiceManifestName="ReplicaTestAppPkg" ServiceManifestVersion="1.0.0" />
<ConfigOverrides />
<EnvironmentOverrides CodePackageRef="code">
<EnvironmentVariable Name="ASPNETCORE_ENVIRONMENT" Value="[ReplicaTestApp_ASPNETCORE_ENVIRONMENT]" />
</EnvironmentOverrides>
</ServiceManifestImport>
</ApplicationManifest>
4 changes: 4 additions & 0 deletions ReplicaRole.TestApp/ApplicationParameters/Cloud.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Application xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="fabric:/ReplicaRole.TestApp" xmlns="http://schemas.microsoft.com/2011/01/fabric">
<Parameters />
</Application>
6 changes: 6 additions & 0 deletions ReplicaRole.TestApp/ApplicationParameters/Local.1Node.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Application xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="fabric:/ReplicaRole.TestApp" xmlns="http://schemas.microsoft.com/2011/01/fabric">
<Parameters>
<Parameter Name="ReplicaTestApp_ASPNETCORE_ENVIRONMENT" Value="Development" />
</Parameters>
</Application>
6 changes: 6 additions & 0 deletions ReplicaRole.TestApp/ApplicationParameters/Local.5Node.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Application xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="fabric:/ReplicaRole.TestApp" xmlns="http://schemas.microsoft.com/2011/01/fabric">
<Parameters>
<Parameter Name="ReplicaTestApp_ASPNETCORE_ENVIRONMENT" Value="Development" />
</Parameters>
</Application>
27 changes: 27 additions & 0 deletions ReplicaRole.TestApp/PublishProfiles/Cloud.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<PublishProfile xmlns="http://schemas.microsoft.com/2015/05/fabrictools">
<!-- ClusterConnectionParameters allows you to specify the PowerShell parameters to use when connecting to the Service Fabric cluster.
Valid parameters are any that are accepted by the Connect-ServiceFabricCluster cmdlet.

For a remote cluster, you would need to specify the appropriate parameters for that specific cluster.
For example: <ClusterConnectionParameters ConnectionEndpoint="mycluster.westus.cloudapp.azure.com:19000" />

Example showing parameters for a cluster that uses certificate security:
<ClusterConnectionParameters ConnectionEndpoint="mycluster.westus.cloudapp.azure.com:19000"
X509Credential="true"
ServerCertThumbprint="0123456789012345678901234567890123456789"
FindType="FindByThumbprint"
FindValue="9876543210987654321098765432109876543210"
StoreLocation="CurrentUser"
StoreName="My" />

Example showing parameters for a cluster that uses Microsoft Entra ID (formerly known as Azure Active Directory) security:
<ClusterConnectionParameters ConnectionEndpoint="mycluster.westus.cloudapp.azure.com:19000"
AzureActiveDirectory="true"
ServerCertThumbprint="0123456789012345678901234567890123456789" />
-->
<ClusterConnectionParameters ConnectionEndpoint="" />
<ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
<StartupServiceParameterFile Path="..\StartupServiceParameters\Cloud.xml" />
<CopyPackageParameters CompressPackage="true" />
</PublishProfile>
12 changes: 12 additions & 0 deletions ReplicaRole.TestApp/PublishProfiles/Local.1Node.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<PublishProfile xmlns="http://schemas.microsoft.com/2015/05/fabrictools">
<!-- ClusterConnectionParameters allows you to specify the PowerShell parameters to use when connecting to the Service Fabric cluster.
Valid parameters are any that are accepted by the Connect-ServiceFabricCluster cmdlet.

For a local cluster, you would typically not use any parameters.
For example: <ClusterConnectionParameters />
-->
<ClusterConnectionParameters />
<ApplicationParameterFile Path="..\ApplicationParameters\Local.1Node.xml" />
<StartupServiceParameterFile Path="..\StartupServiceParameters\Local.1Node.xml" />
</PublishProfile>
12 changes: 12 additions & 0 deletions ReplicaRole.TestApp/PublishProfiles/Local.5Node.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<PublishProfile xmlns="http://schemas.microsoft.com/2015/05/fabrictools">
<!-- ClusterConnectionParameters allows you to specify the PowerShell parameters to use when connecting to the Service Fabric cluster.
Valid parameters are any that are accepted by the Connect-ServiceFabricCluster cmdlet.

For a local cluster, you would typically not use any parameters.
For example: <ClusterConnectionParameters />
-->
<ClusterConnectionParameters />
<ApplicationParameterFile Path="..\ApplicationParameters\Local.5Node.xml" />
<StartupServiceParameterFile Path="..\StartupServiceParameters\Local.5Node.xml" />
</PublishProfile>
51 changes: 51 additions & 0 deletions ReplicaRole.TestApp/ReplicaRole.TestApp.sfproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.9\build\Microsoft.VisualStudio.Azure.Fabric.Application.props" Condition="Exists('..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.9\build\Microsoft.VisualStudio.Azure.Fabric.Application.props')" />
<PropertyGroup Label="Globals">
<ProjectGuid>d22fc4fc-ddc0-41dc-943f-d9c278a92800</ProjectGuid>
<ProjectVersion>2.7</ProjectVersion>
<MinToolsVersion>16.10</MinToolsVersion>
<SupportedMSBuildNuGetPackageVersion>1.7.9</SupportedMSBuildNuGetPackageVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
</PropertyGroup>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<ItemGroup>
<None Include="ApplicationPackageRoot\ApplicationManifest.xml" />
<None Include="ApplicationParameters\Cloud.xml" />
<None Include="ApplicationParameters\Local.1Node.xml" />
<None Include="ApplicationParameters\Local.5Node.xml" />
<None Include="PublishProfiles\Cloud.xml" />
<None Include="PublishProfiles\Local.1Node.xml" />
<None Include="PublishProfiles\Local.5Node.xml" />
<None Include="Scripts\Deploy-FabricApplication.ps1" />
<None Include="StartupServiceParameters\Cloud.xml" />
<None Include="StartupServiceParameters\Local.1Node.xml" />
<None Include="StartupServiceParameters\Local.5Node.xml" />
<None Include="StartupServices.xml" />
</ItemGroup>
<ItemGroup>
<Content Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ReplicaTestApp\ReplicaTestApp.csproj" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
<PropertyGroup>
<ApplicationProjectTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Service Fabric Tools\Microsoft.VisualStudio.Azure.Fabric.ApplicationProject.targets</ApplicationProjectTargetsPath>
</PropertyGroup>
<Import Project="$(ApplicationProjectTargetsPath)" Condition="Exists('$(ApplicationProjectTargetsPath)')" />
<Import Project="..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.9\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.9\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets')" />
<Target Name="ValidateMSBuildFiles" BeforeTargets="PrepareForBuild">
<Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.9\build\Microsoft.VisualStudio.Azure.Fabric.Application.props')" Text="Unable to find the '..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.9\build\Microsoft.VisualStudio.Azure.Fabric.Application.props' file. Please restore the 'Microsoft.VisualStudio.Azure.Fabric.MSBuild' Nuget package." />
<Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.9\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets')" Text="Unable to find the '..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.9\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets' file. Please restore the 'Microsoft.VisualStudio.Azure.Fabric.MSBuild' Nuget package." />
</Target>
</Project>
Loading
Loading