This commit is contained in:
Saket Harsh 2021-04-23 17:36:21 +05:30 коммит произвёл GitHub
Родитель f42c2c015b
Коммит 9aaf03e3bd
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
17 изменённых файлов: 31 добавлений и 31 удалений

Просмотреть файл

@ -123,11 +123,11 @@ By default the script will create a `release` package of the application in `out
Choose one of the following methods for deployment. Service Fabric best practice is to use arm templates for application deployments. Example template and argument files are located in [/arm](/arm) directory.
#### click button below to deploy using azure arm app template
#### Click button below to deploy using azure arm app template
[![Deploy to Azure](https://aka.ms/deploytoazurebutton)](https://portal.azure.com/#create/Microsoft.Template/uri/https%3A%2F%2Fraw.githubusercontent.com%2Fmicrosoft%2FService-Fabric-POA%2Fmaster%2Farm%2Ftemplate.json)
#### using powershell
#### Using powershell
- Open PowerShell command prompt and go to the root of the repository.

Просмотреть файл

@ -3,14 +3,14 @@
"contentVersion": "1.0.0.0",
"parameters": {
"appPackageUrl": {
"defaultValue": "https://github.com/microsoft/Service-Fabric-POA/releases/download/v1.4.9/PatchOrchestrationApplication_v1.4.9.sfpkg",
"defaultValue": "https://github.com/microsoft/Service-Fabric-POA/releases/download/v1.5.0/PatchOrchestrationApplication_v1.5.0.sfpkg",
"metadata": {
"description": "The URL to the application package sfpkg file. example: https://github.com/microsoft/Service-Fabric-POA/releases/download/{{version}}/PatchOrchestrationApplication_{{version}}.sfpkg"
},
"type": "String"
},
"applicationTypeVersion": {
"defaultValue": "1.4.9",
"defaultValue": "1.5.0",
"metadata": {
"description": "The application type version."
},

Просмотреть файл

@ -3,10 +3,10 @@
"contentVersion": "1.0.0.0",
"parameters": {
"appPackageUrl": {
"value": "https://github.com/microsoft/Service-Fabric-POA/releases/download/v1.4.9/PatchOrchestrationApplication_v1.4.9.sfpkg"
"value": "https://github.com/microsoft/Service-Fabric-POA/releases/download/v1.5.0/PatchOrchestrationApplication_v1.5.0.sfpkg"
},
"applicationTypeVersion": {
"value": "1.4.9"
"value": "1.5.0"
},
"clusterName": {
"value": "{{cluster name}}"

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ServiceManifest Name="CoordinatorServicePkg"
Version="1.4.9"
Version="1.5.0"
xmlns="http://schemas.microsoft.com/2011/01/fabric"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@ -11,7 +11,7 @@
</ServiceTypes>
<!-- Code package is your service executable. -->
<CodePackage Name="Code" Version="1.4.9">
<CodePackage Name="Code" Version="1.5.0">
<EntryPoint>
<ExeHost>
<Program>CoordinatorService.exe</Program>
@ -21,7 +21,7 @@
<!-- Config package is the contents of the Config directoy under PackageRoot that contains an
independently-updateable and versioned set of custom configuration settings for your service. -->
<ConfigPackage Name="Config" Version="1.4.9" />
<ConfigPackage Name="Config" Version="1.5.0" />
<Resources>
<Endpoints>

Просмотреть файл

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("1.4.9")]
[assembly: AssemblyFileVersion("1.4.9")]
[assembly: AssemblyVersion("1.5.0")]
[assembly: AssemblyFileVersion("1.5.0")]

Просмотреть файл

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("1.4.9")]
[assembly: AssemblyFileVersion("1.4.9")]
[assembly: AssemblyVersion("1.5.0")]
[assembly: AssemblyFileVersion("1.5.0")]

Просмотреть файл

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("1.4.9")]
[assembly: AssemblyFileVersion("1.4.9")]
[assembly: AssemblyVersion("1.5.0")]
[assembly: AssemblyFileVersion("1.5.0")]

Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<ServiceManifest Name="NodeAgentServicePkg"
Version="1.4.9"
Version="1.5.0"
xmlns="http://schemas.microsoft.com/2011/01/fabric"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
@ -11,7 +11,7 @@
</ServiceTypes>
<!-- Code package is your service executable. -->
<CodePackage Name="Code" Version="1.4.9">
<CodePackage Name="Code" Version="1.5.0">
<SetupEntryPoint>
<ExeHost>
<Program>SetupEntryPoint.bat</Program>
@ -27,7 +27,7 @@
<!-- Config package is the contents of the Config directoy under PackageRoot that contains an
independently-updateable and versioned set of custom configuration settings for your service. -->
<ConfigPackage Name="Config" Version="1.4.9" />
<ConfigPackage Name="Config" Version="1.5.0" />
<Resources>
<Endpoints>

Просмотреть файл

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("1.4.9")]
[assembly: AssemblyFileVersion("1.4.9")]
[assembly: AssemblyVersion("1.5.0")]
[assembly: AssemblyFileVersion("1.5.0")]

Просмотреть файл

@ -1,5 +1,5 @@
<?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="PatchOrchestrationApplicationType" ApplicationTypeVersion="1.4.9" xmlns="http://schemas.microsoft.com/2011/01/fabric">
<ApplicationManifest xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ApplicationTypeName="PatchOrchestrationApplicationType" ApplicationTypeVersion="1.5.0" xmlns="http://schemas.microsoft.com/2011/01/fabric">
<Parameters>
<Parameter Name="CoordinatorService_MinReplicaSetSize" DefaultValue="3" />
<Parameter Name="CoordinatorService_TargetReplicaSetSize" DefaultValue="3" />
@ -54,7 +54,7 @@
should match the Name and Version attributes of the ServiceManifest element defined in the
ServiceManifest.xml file. -->
<ServiceManifestImport>
<ServiceManifestRef ServiceManifestName="CoordinatorServicePkg" ServiceManifestVersion="1.4.9" />
<ServiceManifestRef ServiceManifestName="CoordinatorServicePkg" ServiceManifestVersion="1.5.0" />
<ConfigOverrides>
<ConfigOverride Name="Config">
<Settings>
@ -68,7 +68,7 @@
</ConfigOverrides>
</ServiceManifestImport>
<ServiceManifestImport>
<ServiceManifestRef ServiceManifestName="NodeAgentServicePkg" ServiceManifestVersion="1.4.9" />
<ServiceManifestRef ServiceManifestName="NodeAgentServicePkg" ServiceManifestVersion="1.5.0" />
<ConfigOverrides>
<ConfigOverride Name="Config">
<Settings>

Просмотреть файл

@ -16,7 +16,7 @@
<PropertyGroup Label="Configuration">
<Id>ServiceFabric.PatchOrchestrationApplication</Id>
<Title>ServiceFabric.PatchOrchestrationApplication</Title>
<Version>1.4.9</Version>
<Version>1.5.0</Version>
<Authors>brkhande;raunakp</Authors>
<Owners>brkhande;raunakp</Owners>
<Description>This package contains Service Fabric Patch Orchestration Application.</Description>

Просмотреть файл

@ -11,7 +11,7 @@ Param
$ImageStoreConnectionString = "fabric:ImageStore",
[string]
$ApplicationVersion = "1.4.9",
$ApplicationVersion = "1.5.0",
[hashtable]
$ApplicationParameters = @{}

Просмотреть файл

@ -8,7 +8,7 @@ Param
$ImageStoreConnectionString = "fabric:ImageStore",
[string]
$ApplicationVersion = "1.4.9"
$ApplicationVersion = "1.5.0"
)
Remove-ServiceFabricApplication -ApplicationName fabric:/PatchOrchestrationApplication -Force

Просмотреть файл

@ -11,7 +11,7 @@ Param
$ImageStoreConnectionString = "fabric:ImageStore",
[string]
$ApplicationVersion = "1.4.9",
$ApplicationVersion = "1.5.0",
[hashtable]
$ApplicationParameters = @{},

Просмотреть файл

@ -35,5 +35,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.4.9")]
[assembly: AssemblyFileVersion("1.4.9")]
[assembly: AssemblyVersion("1.5.0")]
[assembly: AssemblyFileVersion("1.5.0")]

Просмотреть файл

@ -27,7 +27,7 @@ namespace Microsoft.ServiceFabric.PatchOrchestration.TelemetryLib
// Every time a new version of application would be release, manually update this version.
// This application version is used for telemetry
// For consistency keep this applicaiton version same as application version from application manifest.
private const string ApplicationVersion = "1.4.9";
private const string ApplicationVersion = "1.5.0";
public TelemetryEvents(FabricClient fabricClient, ITelemetryEventSource eventSource)
{

Просмотреть файл

@ -25,7 +25,7 @@
1. Assembly info
2. File info
3. Not yet in Telemetry of windows -->
<VersionPrefix>1.4.9</VersionPrefix>
<VersionPrefix>1.5.0</VersionPrefix>
<Company>Microsoft</Company>
<!--GenerateAssemblyInfo>false</GenerateAssemblyInfo-->
</PropertyGroup>