diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationPackageRoot/ApplicationManifest.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationPackageRoot/ApplicationManifest.xml deleted file mode 100644 index bb1cf2743..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationPackageRoot/ApplicationManifest.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationPackageRoot/RabbitMQPkg/Config/Settings.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationPackageRoot/RabbitMQPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationPackageRoot/RabbitMQPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationPackageRoot/RabbitMQPkg/ServiceManifest.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationPackageRoot/RabbitMQPkg/ServiceManifest.xml deleted file mode 100644 index 8c2f16691..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationPackageRoot/RabbitMQPkg/ServiceManifest.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - rabbitmq:3-management - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationParameters/Cloud.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationParameters/Cloud.xml deleted file mode 100644 index 5a4c2828d..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationParameters/Cloud.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationParameters/Local.1Node.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationParameters/Local.1Node.xml deleted file mode 100644 index 1699b8eaa..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationParameters/Local.1Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationParameters/Local.5Node.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationParameters/Local.5Node.xml deleted file mode 100644 index 1699b8eaa..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationParameters/Local.5Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/Bus.sfproj b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/Bus.sfproj deleted file mode 100644 index 0a56c800e..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/Bus.sfproj +++ /dev/null @@ -1,46 +0,0 @@ - - - - - f29e27c9-0d5e-4a57-adbf-dd651649d2a1 - 1.7 - 1.5 - 1.6 - v4.6.1 - - - - Debug - x64 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Service Fabric Tools\Microsoft.VisualStudio.Azure.Fabric.ApplicationProject.targets - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/PublishProfiles/Cloud.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/PublishProfiles/Cloud.xml deleted file mode 100644 index 2ab9df11c..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/PublishProfiles/Cloud.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/PublishProfiles/Local.1Node.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/PublishProfiles/Local.1Node.xml deleted file mode 100644 index 6e1403e96..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/PublishProfiles/Local.1Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/PublishProfiles/Local.5Node.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/PublishProfiles/Local.5Node.xml deleted file mode 100644 index f42d759c3..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/PublishProfiles/Local.5Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/Scripts/Deploy-FabricApplication.ps1 b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/Scripts/Deploy-FabricApplication.ps1 deleted file mode 100644 index 2897b10e8..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/Scripts/Deploy-FabricApplication.ps1 +++ /dev/null @@ -1,258 +0,0 @@ -<# -.SYNOPSIS -Deploys a Service Fabric application type to a cluster. - -.DESCRIPTION -This script deploys a Service Fabric application type to a cluster. It is invoked by Visual Studio when deploying a Service Fabric Application project. - -.NOTES -WARNING: This script file is invoked by Visual Studio. Its parameters must not be altered but its logic can be customized as necessary. - -.PARAMETER PublishProfileFile -Path to the file containing the publish profile. - -.PARAMETER ApplicationPackagePath -Path to the folder of the packaged Service Fabric application. - -.PARAMETER DeployOnly -Indicates that the Service Fabric application should not be created or upgraded after registering the application type. - -.PARAMETER ApplicationParameter -Hashtable of the Service Fabric application parameters to be used for the application. - -.PARAMETER UnregisterUnusedApplicationVersionsAfterUpgrade -Indicates whether to unregister any unused application versions that exist after an upgrade is finished. - -.PARAMETER OverrideUpgradeBehavior -Indicates the behavior used to override the upgrade settings specified by the publish profile. -'None' indicates that the upgrade settings will not be overridden. -'ForceUpgrade' indicates that an upgrade will occur with default settings, regardless of what is specified in the publish profile. -'VetoUpgrade' indicates that an upgrade will not occur, regardless of what is specified in the publish profile. - -.PARAMETER UseExistingClusterConnection -Indicates that the script should make use of an existing cluster connection that has already been established in the PowerShell session. The cluster connection parameters configured in the publish profile are ignored. - -.PARAMETER OverwriteBehavior -Overwrite Behavior if an application exists in the cluster with the same name. Available Options are Never, Always, SameAppTypeAndVersion. This setting is not applicable when upgrading an application. -'Never' will not remove the existing application. This is the default behavior. -'Always' will remove the existing application even if its Application type and Version is different from the application being created. -'SameAppTypeAndVersion' will remove the existing application only if its Application type and Version is same as the application being created. - -.PARAMETER SkipPackageValidation -Switch signaling whether the package should be validated or not before deployment. - -.PARAMETER SecurityToken -A security token for authentication to cluster management endpoints. Used for silent authentication to clusters that are protected by Azure Active Directory. - -.PARAMETER CopyPackageTimeoutSec -Timeout in seconds for copying application package to image store. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' - -Deploy the application using the default package location for a Debug build. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -DoNotCreateApplication - -Deploy the application but do not create the application instance. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -ApplicationParameter @{CustomParameter1='MyValue'; CustomParameter2='MyValue'} - -Deploy the application by providing values for parameters that are defined in the application manifest. -#> - -Param -( - [String] - $PublishProfileFile, - - [String] - $ApplicationPackagePath, - - [Switch] - $DeployOnly, - - [Hashtable] - $ApplicationParameter, - - [Boolean] - $UnregisterUnusedApplicationVersionsAfterUpgrade, - - [String] - [ValidateSet('None', 'ForceUpgrade', 'VetoUpgrade')] - $OverrideUpgradeBehavior = 'None', - - [Switch] - $UseExistingClusterConnection, - - [String] - [ValidateSet('Never','Always','SameAppTypeAndVersion')] - $OverwriteBehavior = 'Never', - - [Switch] - $SkipPackageValidation, - - [String] - $SecurityToken, - - [int] - $CopyPackageTimeoutSec -) - -function Read-XmlElementAsHashtable -{ - Param ( - [System.Xml.XmlElement] - $Element - ) - - $hashtable = @{} - if ($Element.Attributes) - { - $Element.Attributes | - ForEach-Object { - $boolVal = $null - if ([bool]::TryParse($_.Value, [ref]$boolVal)) { - $hashtable[$_.Name] = $boolVal - } - else { - $hashtable[$_.Name] = $_.Value - } - } - } - - return $hashtable -} - -function Read-PublishProfile -{ - Param ( - [ValidateScript({Test-Path $_ -PathType Leaf})] - [String] - $PublishProfileFile - ) - - $publishProfileXml = [Xml] (Get-Content $PublishProfileFile) - $publishProfile = @{} - - $publishProfile.ClusterConnectionParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("ClusterConnectionParameters") - $publishProfile.UpgradeDeployment = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment") - $publishProfile.CopyPackageParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("CopyPackageParameters") - - if ($publishProfileXml.PublishProfile.Item("UpgradeDeployment")) - { - $publishProfile.UpgradeDeployment.Parameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment").Item("Parameters") - if ($publishProfile.UpgradeDeployment["Mode"]) - { - $publishProfile.UpgradeDeployment.Parameters[$publishProfile.UpgradeDeployment["Mode"]] = $true - } - } - - $publishProfileFolder = (Split-Path $PublishProfileFile) - $publishProfile.ApplicationParameterFile = [System.IO.Path]::Combine($PublishProfileFolder, $publishProfileXml.PublishProfile.ApplicationParameterFile.Path) - - return $publishProfile -} - -$LocalFolder = (Split-Path $MyInvocation.MyCommand.Path) - -if (!$PublishProfileFile) -{ - $PublishProfileFile = "$LocalFolder\..\PublishProfiles\Local.xml" -} - -if (!$ApplicationPackagePath) -{ - $ApplicationPackagePath = "$LocalFolder\..\pkg\Release" -} - -$ApplicationPackagePath = Resolve-Path $ApplicationPackagePath - -$publishProfile = Read-PublishProfile $PublishProfileFile - -if (-not $UseExistingClusterConnection) -{ - $ClusterConnectionParameters = $publishProfile.ClusterConnectionParameters - if ($SecurityToken) - { - $ClusterConnectionParameters["SecurityToken"] = $SecurityToken - } - - try - { - [void](Connect-ServiceFabricCluster @ClusterConnectionParameters) - } - catch [System.Fabric.FabricObjectClosedException] - { - Write-Warning "Service Fabric cluster may not be connected." - throw - } -} - -$RegKey = "HKLM:\SOFTWARE\Microsoft\Service Fabric SDK" -$ModuleFolderPath = (Get-ItemProperty -Path $RegKey -Name FabricSDKPSModulePath).FabricSDKPSModulePath -Import-Module "$ModuleFolderPath\ServiceFabricSDK.psm1" - -$IsUpgrade = ($publishProfile.UpgradeDeployment -and $publishProfile.UpgradeDeployment.Enabled -and $OverrideUpgradeBehavior -ne 'VetoUpgrade') -or $OverrideUpgradeBehavior -eq 'ForceUpgrade' - -$PublishParameters = @{ - 'ApplicationPackagePath' = $ApplicationPackagePath - 'ApplicationParameterFilePath' = $publishProfile.ApplicationParameterFile - 'ApplicationParameter' = $ApplicationParameter - 'ErrorAction' = 'Stop' -} - -if ($publishProfile.CopyPackageParameters.CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $publishProfile.CopyPackageParameters.CopyPackageTimeoutSec -} - -if ($publishProfile.CopyPackageParameters.CompressPackage) -{ - $PublishParameters['CompressPackage'] = $publishProfile.CopyPackageParameters.CompressPackage -} - -# CopyPackageTimeoutSec parameter overrides the value from the publish profile -if ($CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $CopyPackageTimeoutSec -} - -if ($IsUpgrade) -{ - $Action = "RegisterAndUpgrade" - if ($DeployOnly) - { - $Action = "Register" - } - - $UpgradeParameters = $publishProfile.UpgradeDeployment.Parameters - - if ($OverrideUpgradeBehavior -eq 'ForceUpgrade') - { - # Warning: Do not alter these upgrade parameters. It will create an inconsistency with Visual Studio's behavior. - $UpgradeParameters = @{ UnmonitoredAuto = $true; Force = $true } - } - - $PublishParameters['Action'] = $Action - $PublishParameters['UpgradeParameters'] = $UpgradeParameters - $PublishParameters['UnregisterUnusedVersions'] = $UnregisterUnusedApplicationVersionsAfterUpgrade - - Publish-UpgradedServiceFabricApplication @PublishParameters -} -else -{ - $Action = "RegisterAndCreate" - if ($DeployOnly) - { - $Action = "Register" - } - - $PublishParameters['Action'] = $Action - $PublishParameters['OverwriteBehavior'] = $OverwriteBehavior - $PublishParameters['SkipPackageValidation'] = $SkipPackageValidation - - Publish-NewServiceFabricApplication @PublishParameters -} \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/packages.config b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/packages.config deleted file mode 100644 index 3dc0a332b..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricBus/Bus/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationPackageRoot/ApplicationManifest.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationPackageRoot/ApplicationManifest.xml deleted file mode 100644 index fe031fe95..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationPackageRoot/ApplicationManifest.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationPackageRoot/MongoDBPkg/Config/Settings.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationPackageRoot/MongoDBPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationPackageRoot/MongoDBPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationPackageRoot/MongoDBPkg/ServiceManifest.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationPackageRoot/MongoDBPkg/ServiceManifest.xml deleted file mode 100644 index e7ecf592f..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationPackageRoot/MongoDBPkg/ServiceManifest.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - mongo:latest - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationParameters/Cloud.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationParameters/Cloud.xml deleted file mode 100644 index 8b48c39d1..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationParameters/Cloud.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationParameters/Local.1Node.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationParameters/Local.1Node.xml deleted file mode 100644 index 22363f273..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationParameters/Local.1Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationParameters/Local.5Node.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationParameters/Local.5Node.xml deleted file mode 100644 index 22363f273..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationParameters/Local.5Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/NoSQL.sfproj b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/NoSQL.sfproj deleted file mode 100644 index f07ff03a9..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/NoSQL.sfproj +++ /dev/null @@ -1,46 +0,0 @@ - - - - - eb070036-ec60-49a6-88e1-562a2043c3d7 - 1.7 - 1.5 - 1.6 - v4.6.1 - - - - Debug - x64 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Service Fabric Tools\Microsoft.VisualStudio.Azure.Fabric.ApplicationProject.targets - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/PublishProfiles/Cloud.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/PublishProfiles/Cloud.xml deleted file mode 100644 index 2ab9df11c..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/PublishProfiles/Cloud.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/PublishProfiles/Local.1Node.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/PublishProfiles/Local.1Node.xml deleted file mode 100644 index 6e1403e96..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/PublishProfiles/Local.1Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/PublishProfiles/Local.5Node.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/PublishProfiles/Local.5Node.xml deleted file mode 100644 index f42d759c3..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/PublishProfiles/Local.5Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/Scripts/Deploy-FabricApplication.ps1 b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/Scripts/Deploy-FabricApplication.ps1 deleted file mode 100644 index 2897b10e8..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/Scripts/Deploy-FabricApplication.ps1 +++ /dev/null @@ -1,258 +0,0 @@ -<# -.SYNOPSIS -Deploys a Service Fabric application type to a cluster. - -.DESCRIPTION -This script deploys a Service Fabric application type to a cluster. It is invoked by Visual Studio when deploying a Service Fabric Application project. - -.NOTES -WARNING: This script file is invoked by Visual Studio. Its parameters must not be altered but its logic can be customized as necessary. - -.PARAMETER PublishProfileFile -Path to the file containing the publish profile. - -.PARAMETER ApplicationPackagePath -Path to the folder of the packaged Service Fabric application. - -.PARAMETER DeployOnly -Indicates that the Service Fabric application should not be created or upgraded after registering the application type. - -.PARAMETER ApplicationParameter -Hashtable of the Service Fabric application parameters to be used for the application. - -.PARAMETER UnregisterUnusedApplicationVersionsAfterUpgrade -Indicates whether to unregister any unused application versions that exist after an upgrade is finished. - -.PARAMETER OverrideUpgradeBehavior -Indicates the behavior used to override the upgrade settings specified by the publish profile. -'None' indicates that the upgrade settings will not be overridden. -'ForceUpgrade' indicates that an upgrade will occur with default settings, regardless of what is specified in the publish profile. -'VetoUpgrade' indicates that an upgrade will not occur, regardless of what is specified in the publish profile. - -.PARAMETER UseExistingClusterConnection -Indicates that the script should make use of an existing cluster connection that has already been established in the PowerShell session. The cluster connection parameters configured in the publish profile are ignored. - -.PARAMETER OverwriteBehavior -Overwrite Behavior if an application exists in the cluster with the same name. Available Options are Never, Always, SameAppTypeAndVersion. This setting is not applicable when upgrading an application. -'Never' will not remove the existing application. This is the default behavior. -'Always' will remove the existing application even if its Application type and Version is different from the application being created. -'SameAppTypeAndVersion' will remove the existing application only if its Application type and Version is same as the application being created. - -.PARAMETER SkipPackageValidation -Switch signaling whether the package should be validated or not before deployment. - -.PARAMETER SecurityToken -A security token for authentication to cluster management endpoints. Used for silent authentication to clusters that are protected by Azure Active Directory. - -.PARAMETER CopyPackageTimeoutSec -Timeout in seconds for copying application package to image store. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' - -Deploy the application using the default package location for a Debug build. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -DoNotCreateApplication - -Deploy the application but do not create the application instance. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -ApplicationParameter @{CustomParameter1='MyValue'; CustomParameter2='MyValue'} - -Deploy the application by providing values for parameters that are defined in the application manifest. -#> - -Param -( - [String] - $PublishProfileFile, - - [String] - $ApplicationPackagePath, - - [Switch] - $DeployOnly, - - [Hashtable] - $ApplicationParameter, - - [Boolean] - $UnregisterUnusedApplicationVersionsAfterUpgrade, - - [String] - [ValidateSet('None', 'ForceUpgrade', 'VetoUpgrade')] - $OverrideUpgradeBehavior = 'None', - - [Switch] - $UseExistingClusterConnection, - - [String] - [ValidateSet('Never','Always','SameAppTypeAndVersion')] - $OverwriteBehavior = 'Never', - - [Switch] - $SkipPackageValidation, - - [String] - $SecurityToken, - - [int] - $CopyPackageTimeoutSec -) - -function Read-XmlElementAsHashtable -{ - Param ( - [System.Xml.XmlElement] - $Element - ) - - $hashtable = @{} - if ($Element.Attributes) - { - $Element.Attributes | - ForEach-Object { - $boolVal = $null - if ([bool]::TryParse($_.Value, [ref]$boolVal)) { - $hashtable[$_.Name] = $boolVal - } - else { - $hashtable[$_.Name] = $_.Value - } - } - } - - return $hashtable -} - -function Read-PublishProfile -{ - Param ( - [ValidateScript({Test-Path $_ -PathType Leaf})] - [String] - $PublishProfileFile - ) - - $publishProfileXml = [Xml] (Get-Content $PublishProfileFile) - $publishProfile = @{} - - $publishProfile.ClusterConnectionParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("ClusterConnectionParameters") - $publishProfile.UpgradeDeployment = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment") - $publishProfile.CopyPackageParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("CopyPackageParameters") - - if ($publishProfileXml.PublishProfile.Item("UpgradeDeployment")) - { - $publishProfile.UpgradeDeployment.Parameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment").Item("Parameters") - if ($publishProfile.UpgradeDeployment["Mode"]) - { - $publishProfile.UpgradeDeployment.Parameters[$publishProfile.UpgradeDeployment["Mode"]] = $true - } - } - - $publishProfileFolder = (Split-Path $PublishProfileFile) - $publishProfile.ApplicationParameterFile = [System.IO.Path]::Combine($PublishProfileFolder, $publishProfileXml.PublishProfile.ApplicationParameterFile.Path) - - return $publishProfile -} - -$LocalFolder = (Split-Path $MyInvocation.MyCommand.Path) - -if (!$PublishProfileFile) -{ - $PublishProfileFile = "$LocalFolder\..\PublishProfiles\Local.xml" -} - -if (!$ApplicationPackagePath) -{ - $ApplicationPackagePath = "$LocalFolder\..\pkg\Release" -} - -$ApplicationPackagePath = Resolve-Path $ApplicationPackagePath - -$publishProfile = Read-PublishProfile $PublishProfileFile - -if (-not $UseExistingClusterConnection) -{ - $ClusterConnectionParameters = $publishProfile.ClusterConnectionParameters - if ($SecurityToken) - { - $ClusterConnectionParameters["SecurityToken"] = $SecurityToken - } - - try - { - [void](Connect-ServiceFabricCluster @ClusterConnectionParameters) - } - catch [System.Fabric.FabricObjectClosedException] - { - Write-Warning "Service Fabric cluster may not be connected." - throw - } -} - -$RegKey = "HKLM:\SOFTWARE\Microsoft\Service Fabric SDK" -$ModuleFolderPath = (Get-ItemProperty -Path $RegKey -Name FabricSDKPSModulePath).FabricSDKPSModulePath -Import-Module "$ModuleFolderPath\ServiceFabricSDK.psm1" - -$IsUpgrade = ($publishProfile.UpgradeDeployment -and $publishProfile.UpgradeDeployment.Enabled -and $OverrideUpgradeBehavior -ne 'VetoUpgrade') -or $OverrideUpgradeBehavior -eq 'ForceUpgrade' - -$PublishParameters = @{ - 'ApplicationPackagePath' = $ApplicationPackagePath - 'ApplicationParameterFilePath' = $publishProfile.ApplicationParameterFile - 'ApplicationParameter' = $ApplicationParameter - 'ErrorAction' = 'Stop' -} - -if ($publishProfile.CopyPackageParameters.CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $publishProfile.CopyPackageParameters.CopyPackageTimeoutSec -} - -if ($publishProfile.CopyPackageParameters.CompressPackage) -{ - $PublishParameters['CompressPackage'] = $publishProfile.CopyPackageParameters.CompressPackage -} - -# CopyPackageTimeoutSec parameter overrides the value from the publish profile -if ($CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $CopyPackageTimeoutSec -} - -if ($IsUpgrade) -{ - $Action = "RegisterAndUpgrade" - if ($DeployOnly) - { - $Action = "Register" - } - - $UpgradeParameters = $publishProfile.UpgradeDeployment.Parameters - - if ($OverrideUpgradeBehavior -eq 'ForceUpgrade') - { - # Warning: Do not alter these upgrade parameters. It will create an inconsistency with Visual Studio's behavior. - $UpgradeParameters = @{ UnmonitoredAuto = $true; Force = $true } - } - - $PublishParameters['Action'] = $Action - $PublishParameters['UpgradeParameters'] = $UpgradeParameters - $PublishParameters['UnregisterUnusedVersions'] = $UnregisterUnusedApplicationVersionsAfterUpgrade - - Publish-UpgradedServiceFabricApplication @PublishParameters -} -else -{ - $Action = "RegisterAndCreate" - if ($DeployOnly) - { - $Action = "Register" - } - - $PublishParameters['Action'] = $Action - $PublishParameters['OverwriteBehavior'] = $OverwriteBehavior - $PublishParameters['SkipPackageValidation'] = $SkipPackageValidation - - Publish-NewServiceFabricApplication @PublishParameters -} \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/packages.config b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/packages.config deleted file mode 100644 index 3dc0a332b..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationPackageRoot/ApplicationManifest.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationPackageRoot/ApplicationManifest.xml deleted file mode 100644 index 11bf47a6a..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationPackageRoot/ApplicationManifest.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationPackageRoot/BasketDataPkg/Config/Settings.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationPackageRoot/BasketDataPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationPackageRoot/BasketDataPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationPackageRoot/BasketDataPkg/ServiceManifest.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationPackageRoot/BasketDataPkg/ServiceManifest.xml deleted file mode 100644 index cfcc10eca..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationPackageRoot/BasketDataPkg/ServiceManifest.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - redis:latest - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationParameters/Cloud.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationParameters/Cloud.xml deleted file mode 100644 index 951ce24db..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationParameters/Cloud.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationParameters/Local.1Node.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationParameters/Local.1Node.xml deleted file mode 100644 index e2f3876c7..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationParameters/Local.1Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationParameters/Local.5Node.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationParameters/Local.5Node.xml deleted file mode 100644 index e2f3876c7..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationParameters/Local.5Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/PublishProfiles/Cloud.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/PublishProfiles/Cloud.xml deleted file mode 100644 index 2ab9df11c..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/PublishProfiles/Cloud.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/PublishProfiles/Local.1Node.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/PublishProfiles/Local.1Node.xml deleted file mode 100644 index 6e1403e96..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/PublishProfiles/Local.1Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/PublishProfiles/Local.5Node.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/PublishProfiles/Local.5Node.xml deleted file mode 100644 index f42d759c3..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/PublishProfiles/Local.5Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/Redis.sfproj b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/Redis.sfproj deleted file mode 100644 index 5b28bfdba..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/Redis.sfproj +++ /dev/null @@ -1,46 +0,0 @@ - - - - - 17acd9ea-8f16-4091-aa29-c67002971eee - 1.7 - 1.5 - 1.6 - v4.6.1 - - - - Debug - x64 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Service Fabric Tools\Microsoft.VisualStudio.Azure.Fabric.ApplicationProject.targets - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/Scripts/Deploy-FabricApplication.ps1 b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/Scripts/Deploy-FabricApplication.ps1 deleted file mode 100644 index 2897b10e8..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/Scripts/Deploy-FabricApplication.ps1 +++ /dev/null @@ -1,258 +0,0 @@ -<# -.SYNOPSIS -Deploys a Service Fabric application type to a cluster. - -.DESCRIPTION -This script deploys a Service Fabric application type to a cluster. It is invoked by Visual Studio when deploying a Service Fabric Application project. - -.NOTES -WARNING: This script file is invoked by Visual Studio. Its parameters must not be altered but its logic can be customized as necessary. - -.PARAMETER PublishProfileFile -Path to the file containing the publish profile. - -.PARAMETER ApplicationPackagePath -Path to the folder of the packaged Service Fabric application. - -.PARAMETER DeployOnly -Indicates that the Service Fabric application should not be created or upgraded after registering the application type. - -.PARAMETER ApplicationParameter -Hashtable of the Service Fabric application parameters to be used for the application. - -.PARAMETER UnregisterUnusedApplicationVersionsAfterUpgrade -Indicates whether to unregister any unused application versions that exist after an upgrade is finished. - -.PARAMETER OverrideUpgradeBehavior -Indicates the behavior used to override the upgrade settings specified by the publish profile. -'None' indicates that the upgrade settings will not be overridden. -'ForceUpgrade' indicates that an upgrade will occur with default settings, regardless of what is specified in the publish profile. -'VetoUpgrade' indicates that an upgrade will not occur, regardless of what is specified in the publish profile. - -.PARAMETER UseExistingClusterConnection -Indicates that the script should make use of an existing cluster connection that has already been established in the PowerShell session. The cluster connection parameters configured in the publish profile are ignored. - -.PARAMETER OverwriteBehavior -Overwrite Behavior if an application exists in the cluster with the same name. Available Options are Never, Always, SameAppTypeAndVersion. This setting is not applicable when upgrading an application. -'Never' will not remove the existing application. This is the default behavior. -'Always' will remove the existing application even if its Application type and Version is different from the application being created. -'SameAppTypeAndVersion' will remove the existing application only if its Application type and Version is same as the application being created. - -.PARAMETER SkipPackageValidation -Switch signaling whether the package should be validated or not before deployment. - -.PARAMETER SecurityToken -A security token for authentication to cluster management endpoints. Used for silent authentication to clusters that are protected by Azure Active Directory. - -.PARAMETER CopyPackageTimeoutSec -Timeout in seconds for copying application package to image store. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' - -Deploy the application using the default package location for a Debug build. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -DoNotCreateApplication - -Deploy the application but do not create the application instance. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -ApplicationParameter @{CustomParameter1='MyValue'; CustomParameter2='MyValue'} - -Deploy the application by providing values for parameters that are defined in the application manifest. -#> - -Param -( - [String] - $PublishProfileFile, - - [String] - $ApplicationPackagePath, - - [Switch] - $DeployOnly, - - [Hashtable] - $ApplicationParameter, - - [Boolean] - $UnregisterUnusedApplicationVersionsAfterUpgrade, - - [String] - [ValidateSet('None', 'ForceUpgrade', 'VetoUpgrade')] - $OverrideUpgradeBehavior = 'None', - - [Switch] - $UseExistingClusterConnection, - - [String] - [ValidateSet('Never','Always','SameAppTypeAndVersion')] - $OverwriteBehavior = 'Never', - - [Switch] - $SkipPackageValidation, - - [String] - $SecurityToken, - - [int] - $CopyPackageTimeoutSec -) - -function Read-XmlElementAsHashtable -{ - Param ( - [System.Xml.XmlElement] - $Element - ) - - $hashtable = @{} - if ($Element.Attributes) - { - $Element.Attributes | - ForEach-Object { - $boolVal = $null - if ([bool]::TryParse($_.Value, [ref]$boolVal)) { - $hashtable[$_.Name] = $boolVal - } - else { - $hashtable[$_.Name] = $_.Value - } - } - } - - return $hashtable -} - -function Read-PublishProfile -{ - Param ( - [ValidateScript({Test-Path $_ -PathType Leaf})] - [String] - $PublishProfileFile - ) - - $publishProfileXml = [Xml] (Get-Content $PublishProfileFile) - $publishProfile = @{} - - $publishProfile.ClusterConnectionParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("ClusterConnectionParameters") - $publishProfile.UpgradeDeployment = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment") - $publishProfile.CopyPackageParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("CopyPackageParameters") - - if ($publishProfileXml.PublishProfile.Item("UpgradeDeployment")) - { - $publishProfile.UpgradeDeployment.Parameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment").Item("Parameters") - if ($publishProfile.UpgradeDeployment["Mode"]) - { - $publishProfile.UpgradeDeployment.Parameters[$publishProfile.UpgradeDeployment["Mode"]] = $true - } - } - - $publishProfileFolder = (Split-Path $PublishProfileFile) - $publishProfile.ApplicationParameterFile = [System.IO.Path]::Combine($PublishProfileFolder, $publishProfileXml.PublishProfile.ApplicationParameterFile.Path) - - return $publishProfile -} - -$LocalFolder = (Split-Path $MyInvocation.MyCommand.Path) - -if (!$PublishProfileFile) -{ - $PublishProfileFile = "$LocalFolder\..\PublishProfiles\Local.xml" -} - -if (!$ApplicationPackagePath) -{ - $ApplicationPackagePath = "$LocalFolder\..\pkg\Release" -} - -$ApplicationPackagePath = Resolve-Path $ApplicationPackagePath - -$publishProfile = Read-PublishProfile $PublishProfileFile - -if (-not $UseExistingClusterConnection) -{ - $ClusterConnectionParameters = $publishProfile.ClusterConnectionParameters - if ($SecurityToken) - { - $ClusterConnectionParameters["SecurityToken"] = $SecurityToken - } - - try - { - [void](Connect-ServiceFabricCluster @ClusterConnectionParameters) - } - catch [System.Fabric.FabricObjectClosedException] - { - Write-Warning "Service Fabric cluster may not be connected." - throw - } -} - -$RegKey = "HKLM:\SOFTWARE\Microsoft\Service Fabric SDK" -$ModuleFolderPath = (Get-ItemProperty -Path $RegKey -Name FabricSDKPSModulePath).FabricSDKPSModulePath -Import-Module "$ModuleFolderPath\ServiceFabricSDK.psm1" - -$IsUpgrade = ($publishProfile.UpgradeDeployment -and $publishProfile.UpgradeDeployment.Enabled -and $OverrideUpgradeBehavior -ne 'VetoUpgrade') -or $OverrideUpgradeBehavior -eq 'ForceUpgrade' - -$PublishParameters = @{ - 'ApplicationPackagePath' = $ApplicationPackagePath - 'ApplicationParameterFilePath' = $publishProfile.ApplicationParameterFile - 'ApplicationParameter' = $ApplicationParameter - 'ErrorAction' = 'Stop' -} - -if ($publishProfile.CopyPackageParameters.CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $publishProfile.CopyPackageParameters.CopyPackageTimeoutSec -} - -if ($publishProfile.CopyPackageParameters.CompressPackage) -{ - $PublishParameters['CompressPackage'] = $publishProfile.CopyPackageParameters.CompressPackage -} - -# CopyPackageTimeoutSec parameter overrides the value from the publish profile -if ($CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $CopyPackageTimeoutSec -} - -if ($IsUpgrade) -{ - $Action = "RegisterAndUpgrade" - if ($DeployOnly) - { - $Action = "Register" - } - - $UpgradeParameters = $publishProfile.UpgradeDeployment.Parameters - - if ($OverrideUpgradeBehavior -eq 'ForceUpgrade') - { - # Warning: Do not alter these upgrade parameters. It will create an inconsistency with Visual Studio's behavior. - $UpgradeParameters = @{ UnmonitoredAuto = $true; Force = $true } - } - - $PublishParameters['Action'] = $Action - $PublishParameters['UpgradeParameters'] = $UpgradeParameters - $PublishParameters['UnregisterUnusedVersions'] = $UnregisterUnusedApplicationVersionsAfterUpgrade - - Publish-UpgradedServiceFabricApplication @PublishParameters -} -else -{ - $Action = "RegisterAndCreate" - if ($DeployOnly) - { - $Action = "Register" - } - - $PublishParameters['Action'] = $Action - $PublishParameters['OverwriteBehavior'] = $OverwriteBehavior - $PublishParameters['SkipPackageValidation'] = $SkipPackageValidation - - Publish-NewServiceFabricApplication @PublishParameters -} \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/packages.config b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/packages.config deleted file mode 100644 index 3dc0a332b..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricRedis/Redis/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationPackageRoot/ApplicationManifest.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationPackageRoot/ApplicationManifest.xml deleted file mode 100644 index 27fa4bfe2..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationPackageRoot/ApplicationManifest.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationPackageRoot/SqlServerPkg/Config/Settings.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationPackageRoot/SqlServerPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationPackageRoot/SqlServerPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationPackageRoot/SqlServerPkg/ServiceManifest.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationPackageRoot/SqlServerPkg/ServiceManifest.xml deleted file mode 100644 index 97ff3ded2..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationPackageRoot/SqlServerPkg/ServiceManifest.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - microsoft/mssql-server-linux:2017-latest - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationParameters/Cloud.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationParameters/Cloud.xml deleted file mode 100644 index 3ad12232a..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationParameters/Cloud.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationParameters/Local.1Node.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationParameters/Local.1Node.xml deleted file mode 100644 index 9fc10b0bc..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationParameters/Local.1Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationParameters/Local.5Node.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationParameters/Local.5Node.xml deleted file mode 100644 index 9fc10b0bc..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationParameters/Local.5Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/PublishProfiles/Cloud.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/PublishProfiles/Cloud.xml deleted file mode 100644 index 2ab9df11c..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/PublishProfiles/Cloud.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/PublishProfiles/Local.1Node.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/PublishProfiles/Local.1Node.xml deleted file mode 100644 index 6e1403e96..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/PublishProfiles/Local.1Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/PublishProfiles/Local.5Node.xml b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/PublishProfiles/Local.5Node.xml deleted file mode 100644 index f42d759c3..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/PublishProfiles/Local.5Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/Scripts/Deploy-FabricApplication.ps1 b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/Scripts/Deploy-FabricApplication.ps1 deleted file mode 100644 index 2897b10e8..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/Scripts/Deploy-FabricApplication.ps1 +++ /dev/null @@ -1,258 +0,0 @@ -<# -.SYNOPSIS -Deploys a Service Fabric application type to a cluster. - -.DESCRIPTION -This script deploys a Service Fabric application type to a cluster. It is invoked by Visual Studio when deploying a Service Fabric Application project. - -.NOTES -WARNING: This script file is invoked by Visual Studio. Its parameters must not be altered but its logic can be customized as necessary. - -.PARAMETER PublishProfileFile -Path to the file containing the publish profile. - -.PARAMETER ApplicationPackagePath -Path to the folder of the packaged Service Fabric application. - -.PARAMETER DeployOnly -Indicates that the Service Fabric application should not be created or upgraded after registering the application type. - -.PARAMETER ApplicationParameter -Hashtable of the Service Fabric application parameters to be used for the application. - -.PARAMETER UnregisterUnusedApplicationVersionsAfterUpgrade -Indicates whether to unregister any unused application versions that exist after an upgrade is finished. - -.PARAMETER OverrideUpgradeBehavior -Indicates the behavior used to override the upgrade settings specified by the publish profile. -'None' indicates that the upgrade settings will not be overridden. -'ForceUpgrade' indicates that an upgrade will occur with default settings, regardless of what is specified in the publish profile. -'VetoUpgrade' indicates that an upgrade will not occur, regardless of what is specified in the publish profile. - -.PARAMETER UseExistingClusterConnection -Indicates that the script should make use of an existing cluster connection that has already been established in the PowerShell session. The cluster connection parameters configured in the publish profile are ignored. - -.PARAMETER OverwriteBehavior -Overwrite Behavior if an application exists in the cluster with the same name. Available Options are Never, Always, SameAppTypeAndVersion. This setting is not applicable when upgrading an application. -'Never' will not remove the existing application. This is the default behavior. -'Always' will remove the existing application even if its Application type and Version is different from the application being created. -'SameAppTypeAndVersion' will remove the existing application only if its Application type and Version is same as the application being created. - -.PARAMETER SkipPackageValidation -Switch signaling whether the package should be validated or not before deployment. - -.PARAMETER SecurityToken -A security token for authentication to cluster management endpoints. Used for silent authentication to clusters that are protected by Azure Active Directory. - -.PARAMETER CopyPackageTimeoutSec -Timeout in seconds for copying application package to image store. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' - -Deploy the application using the default package location for a Debug build. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -DoNotCreateApplication - -Deploy the application but do not create the application instance. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -ApplicationParameter @{CustomParameter1='MyValue'; CustomParameter2='MyValue'} - -Deploy the application by providing values for parameters that are defined in the application manifest. -#> - -Param -( - [String] - $PublishProfileFile, - - [String] - $ApplicationPackagePath, - - [Switch] - $DeployOnly, - - [Hashtable] - $ApplicationParameter, - - [Boolean] - $UnregisterUnusedApplicationVersionsAfterUpgrade, - - [String] - [ValidateSet('None', 'ForceUpgrade', 'VetoUpgrade')] - $OverrideUpgradeBehavior = 'None', - - [Switch] - $UseExistingClusterConnection, - - [String] - [ValidateSet('Never','Always','SameAppTypeAndVersion')] - $OverwriteBehavior = 'Never', - - [Switch] - $SkipPackageValidation, - - [String] - $SecurityToken, - - [int] - $CopyPackageTimeoutSec -) - -function Read-XmlElementAsHashtable -{ - Param ( - [System.Xml.XmlElement] - $Element - ) - - $hashtable = @{} - if ($Element.Attributes) - { - $Element.Attributes | - ForEach-Object { - $boolVal = $null - if ([bool]::TryParse($_.Value, [ref]$boolVal)) { - $hashtable[$_.Name] = $boolVal - } - else { - $hashtable[$_.Name] = $_.Value - } - } - } - - return $hashtable -} - -function Read-PublishProfile -{ - Param ( - [ValidateScript({Test-Path $_ -PathType Leaf})] - [String] - $PublishProfileFile - ) - - $publishProfileXml = [Xml] (Get-Content $PublishProfileFile) - $publishProfile = @{} - - $publishProfile.ClusterConnectionParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("ClusterConnectionParameters") - $publishProfile.UpgradeDeployment = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment") - $publishProfile.CopyPackageParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("CopyPackageParameters") - - if ($publishProfileXml.PublishProfile.Item("UpgradeDeployment")) - { - $publishProfile.UpgradeDeployment.Parameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment").Item("Parameters") - if ($publishProfile.UpgradeDeployment["Mode"]) - { - $publishProfile.UpgradeDeployment.Parameters[$publishProfile.UpgradeDeployment["Mode"]] = $true - } - } - - $publishProfileFolder = (Split-Path $PublishProfileFile) - $publishProfile.ApplicationParameterFile = [System.IO.Path]::Combine($PublishProfileFolder, $publishProfileXml.PublishProfile.ApplicationParameterFile.Path) - - return $publishProfile -} - -$LocalFolder = (Split-Path $MyInvocation.MyCommand.Path) - -if (!$PublishProfileFile) -{ - $PublishProfileFile = "$LocalFolder\..\PublishProfiles\Local.xml" -} - -if (!$ApplicationPackagePath) -{ - $ApplicationPackagePath = "$LocalFolder\..\pkg\Release" -} - -$ApplicationPackagePath = Resolve-Path $ApplicationPackagePath - -$publishProfile = Read-PublishProfile $PublishProfileFile - -if (-not $UseExistingClusterConnection) -{ - $ClusterConnectionParameters = $publishProfile.ClusterConnectionParameters - if ($SecurityToken) - { - $ClusterConnectionParameters["SecurityToken"] = $SecurityToken - } - - try - { - [void](Connect-ServiceFabricCluster @ClusterConnectionParameters) - } - catch [System.Fabric.FabricObjectClosedException] - { - Write-Warning "Service Fabric cluster may not be connected." - throw - } -} - -$RegKey = "HKLM:\SOFTWARE\Microsoft\Service Fabric SDK" -$ModuleFolderPath = (Get-ItemProperty -Path $RegKey -Name FabricSDKPSModulePath).FabricSDKPSModulePath -Import-Module "$ModuleFolderPath\ServiceFabricSDK.psm1" - -$IsUpgrade = ($publishProfile.UpgradeDeployment -and $publishProfile.UpgradeDeployment.Enabled -and $OverrideUpgradeBehavior -ne 'VetoUpgrade') -or $OverrideUpgradeBehavior -eq 'ForceUpgrade' - -$PublishParameters = @{ - 'ApplicationPackagePath' = $ApplicationPackagePath - 'ApplicationParameterFilePath' = $publishProfile.ApplicationParameterFile - 'ApplicationParameter' = $ApplicationParameter - 'ErrorAction' = 'Stop' -} - -if ($publishProfile.CopyPackageParameters.CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $publishProfile.CopyPackageParameters.CopyPackageTimeoutSec -} - -if ($publishProfile.CopyPackageParameters.CompressPackage) -{ - $PublishParameters['CompressPackage'] = $publishProfile.CopyPackageParameters.CompressPackage -} - -# CopyPackageTimeoutSec parameter overrides the value from the publish profile -if ($CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $CopyPackageTimeoutSec -} - -if ($IsUpgrade) -{ - $Action = "RegisterAndUpgrade" - if ($DeployOnly) - { - $Action = "Register" - } - - $UpgradeParameters = $publishProfile.UpgradeDeployment.Parameters - - if ($OverrideUpgradeBehavior -eq 'ForceUpgrade') - { - # Warning: Do not alter these upgrade parameters. It will create an inconsistency with Visual Studio's behavior. - $UpgradeParameters = @{ UnmonitoredAuto = $true; Force = $true } - } - - $PublishParameters['Action'] = $Action - $PublishParameters['UpgradeParameters'] = $UpgradeParameters - $PublishParameters['UnregisterUnusedVersions'] = $UnregisterUnusedApplicationVersionsAfterUpgrade - - Publish-UpgradedServiceFabricApplication @PublishParameters -} -else -{ - $Action = "RegisterAndCreate" - if ($DeployOnly) - { - $Action = "Register" - } - - $PublishParameters['Action'] = $Action - $PublishParameters['OverwriteBehavior'] = $OverwriteBehavior - $PublishParameters['SkipPackageValidation'] = $SkipPackageValidation - - Publish-NewServiceFabricApplication @PublishParameters -} \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/Sql.sfproj b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/Sql.sfproj deleted file mode 100644 index 48447811e..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/Sql.sfproj +++ /dev/null @@ -1,46 +0,0 @@ - - - - - 65a83188-79c1-47ad-931d-8e8a87247408 - 1.7 - 1.5 - 1.6 - v4.6.1 - - - - Debug - x64 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Service Fabric Tools\Microsoft.VisualStudio.Azure.Fabric.ApplicationProject.targets - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/packages.config b/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/packages.config deleted file mode 100644 index 3dc0a332b..000000000 --- a/ServiceFabric/Linux/Infrastructure/eShopOnServiceFabricSql/Sql/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/ApplicationManifest.xml b/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/ApplicationManifest.xml deleted file mode 100644 index 43aa95660..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/ApplicationManifest.xml +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/BasketApiPkg/Config/Settings.xml b/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/BasketApiPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/BasketApiPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/BasketApiPkg/ServiceManifest.xml b/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/BasketApiPkg/ServiceManifest.xml deleted file mode 100644 index 75aecd407..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/BasketApiPkg/ServiceManifest.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - eshop/basket.api:#{tag}# - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/CatalogApiPkg/Config/Settings.xml b/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/CatalogApiPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/CatalogApiPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/CatalogApiPkg/ServiceManifest.xml b/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/CatalogApiPkg/ServiceManifest.xml deleted file mode 100644 index bd30b4494..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/CatalogApiPkg/ServiceManifest.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - eshop/catalog.api:#{tag}# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/LocationsApiPkg/Config/Settings.xml b/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/LocationsApiPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/LocationsApiPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/LocationsApiPkg/ServiceManifest.xml b/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/LocationsApiPkg/ServiceManifest.xml deleted file mode 100644 index 5c19939a4..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/LocationsApiPkg/ServiceManifest.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - eshop/locations.api:#{tag}# - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/MarketingApiPkg/Config/Settings.xml b/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/MarketingApiPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/MarketingApiPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/MarketingApiPkg/ServiceManifest.xml b/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/MarketingApiPkg/ServiceManifest.xml deleted file mode 100644 index defca436c..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/MarketingApiPkg/ServiceManifest.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - eshop/marketing.api:#{tag}# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/OrderingApiPkg/Config/Settings.xml b/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/OrderingApiPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/OrderingApiPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/OrderingApiPkg/ServiceManifest.xml b/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/OrderingApiPkg/ServiceManifest.xml deleted file mode 100644 index 16c67d3a8..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/OrderingApiPkg/ServiceManifest.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - eshop/ordering.api:#{tag}# - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/OrderingBackgroundPkg/Config/Settings.xml b/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/OrderingBackgroundPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/OrderingBackgroundPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/OrderingBackgroundPkg/ServiceManifest.xml b/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/OrderingBackgroundPkg/ServiceManifest.xml deleted file mode 100644 index 248eb72d3..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/OrderingBackgroundPkg/ServiceManifest.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - eshop/ordering.backgroundtasks - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/PaymentApiPkg/Config/Settings.xml b/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/PaymentApiPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/PaymentApiPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/PaymentApiPkg/ServiceManifest.xml b/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/PaymentApiPkg/ServiceManifest.xml deleted file mode 100644 index 88deeeade..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationPackageRoot/PaymentApiPkg/ServiceManifest.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - eshop/payment.api:#{tag}# - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationParameters/Cloud.xml b/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationParameters/Cloud.xml deleted file mode 100644 index 48b8b6b33..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationParameters/Cloud.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationParameters/Local.1Node.xml b/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationParameters/Local.1Node.xml deleted file mode 100644 index e579cbf89..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationParameters/Local.1Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationParameters/Local.5Node.xml b/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationParameters/Local.5Node.xml deleted file mode 100644 index e579cbf89..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabric/ApplicationParameters/Local.5Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabric/PublishProfiles/Cloud.xml b/ServiceFabric/Linux/eShopOnServiceFabric/PublishProfiles/Cloud.xml deleted file mode 100644 index 2ab9df11c..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabric/PublishProfiles/Cloud.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabric/PublishProfiles/Local.1Node.xml b/ServiceFabric/Linux/eShopOnServiceFabric/PublishProfiles/Local.1Node.xml deleted file mode 100644 index 6e1403e96..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabric/PublishProfiles/Local.1Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabric/PublishProfiles/Local.5Node.xml b/ServiceFabric/Linux/eShopOnServiceFabric/PublishProfiles/Local.5Node.xml deleted file mode 100644 index f42d759c3..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabric/PublishProfiles/Local.5Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabric/Scripts/Deploy-FabricApplication.ps1 b/ServiceFabric/Linux/eShopOnServiceFabric/Scripts/Deploy-FabricApplication.ps1 deleted file mode 100644 index 2897b10e8..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabric/Scripts/Deploy-FabricApplication.ps1 +++ /dev/null @@ -1,258 +0,0 @@ -<# -.SYNOPSIS -Deploys a Service Fabric application type to a cluster. - -.DESCRIPTION -This script deploys a Service Fabric application type to a cluster. It is invoked by Visual Studio when deploying a Service Fabric Application project. - -.NOTES -WARNING: This script file is invoked by Visual Studio. Its parameters must not be altered but its logic can be customized as necessary. - -.PARAMETER PublishProfileFile -Path to the file containing the publish profile. - -.PARAMETER ApplicationPackagePath -Path to the folder of the packaged Service Fabric application. - -.PARAMETER DeployOnly -Indicates that the Service Fabric application should not be created or upgraded after registering the application type. - -.PARAMETER ApplicationParameter -Hashtable of the Service Fabric application parameters to be used for the application. - -.PARAMETER UnregisterUnusedApplicationVersionsAfterUpgrade -Indicates whether to unregister any unused application versions that exist after an upgrade is finished. - -.PARAMETER OverrideUpgradeBehavior -Indicates the behavior used to override the upgrade settings specified by the publish profile. -'None' indicates that the upgrade settings will not be overridden. -'ForceUpgrade' indicates that an upgrade will occur with default settings, regardless of what is specified in the publish profile. -'VetoUpgrade' indicates that an upgrade will not occur, regardless of what is specified in the publish profile. - -.PARAMETER UseExistingClusterConnection -Indicates that the script should make use of an existing cluster connection that has already been established in the PowerShell session. The cluster connection parameters configured in the publish profile are ignored. - -.PARAMETER OverwriteBehavior -Overwrite Behavior if an application exists in the cluster with the same name. Available Options are Never, Always, SameAppTypeAndVersion. This setting is not applicable when upgrading an application. -'Never' will not remove the existing application. This is the default behavior. -'Always' will remove the existing application even if its Application type and Version is different from the application being created. -'SameAppTypeAndVersion' will remove the existing application only if its Application type and Version is same as the application being created. - -.PARAMETER SkipPackageValidation -Switch signaling whether the package should be validated or not before deployment. - -.PARAMETER SecurityToken -A security token for authentication to cluster management endpoints. Used for silent authentication to clusters that are protected by Azure Active Directory. - -.PARAMETER CopyPackageTimeoutSec -Timeout in seconds for copying application package to image store. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' - -Deploy the application using the default package location for a Debug build. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -DoNotCreateApplication - -Deploy the application but do not create the application instance. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -ApplicationParameter @{CustomParameter1='MyValue'; CustomParameter2='MyValue'} - -Deploy the application by providing values for parameters that are defined in the application manifest. -#> - -Param -( - [String] - $PublishProfileFile, - - [String] - $ApplicationPackagePath, - - [Switch] - $DeployOnly, - - [Hashtable] - $ApplicationParameter, - - [Boolean] - $UnregisterUnusedApplicationVersionsAfterUpgrade, - - [String] - [ValidateSet('None', 'ForceUpgrade', 'VetoUpgrade')] - $OverrideUpgradeBehavior = 'None', - - [Switch] - $UseExistingClusterConnection, - - [String] - [ValidateSet('Never','Always','SameAppTypeAndVersion')] - $OverwriteBehavior = 'Never', - - [Switch] - $SkipPackageValidation, - - [String] - $SecurityToken, - - [int] - $CopyPackageTimeoutSec -) - -function Read-XmlElementAsHashtable -{ - Param ( - [System.Xml.XmlElement] - $Element - ) - - $hashtable = @{} - if ($Element.Attributes) - { - $Element.Attributes | - ForEach-Object { - $boolVal = $null - if ([bool]::TryParse($_.Value, [ref]$boolVal)) { - $hashtable[$_.Name] = $boolVal - } - else { - $hashtable[$_.Name] = $_.Value - } - } - } - - return $hashtable -} - -function Read-PublishProfile -{ - Param ( - [ValidateScript({Test-Path $_ -PathType Leaf})] - [String] - $PublishProfileFile - ) - - $publishProfileXml = [Xml] (Get-Content $PublishProfileFile) - $publishProfile = @{} - - $publishProfile.ClusterConnectionParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("ClusterConnectionParameters") - $publishProfile.UpgradeDeployment = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment") - $publishProfile.CopyPackageParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("CopyPackageParameters") - - if ($publishProfileXml.PublishProfile.Item("UpgradeDeployment")) - { - $publishProfile.UpgradeDeployment.Parameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment").Item("Parameters") - if ($publishProfile.UpgradeDeployment["Mode"]) - { - $publishProfile.UpgradeDeployment.Parameters[$publishProfile.UpgradeDeployment["Mode"]] = $true - } - } - - $publishProfileFolder = (Split-Path $PublishProfileFile) - $publishProfile.ApplicationParameterFile = [System.IO.Path]::Combine($PublishProfileFolder, $publishProfileXml.PublishProfile.ApplicationParameterFile.Path) - - return $publishProfile -} - -$LocalFolder = (Split-Path $MyInvocation.MyCommand.Path) - -if (!$PublishProfileFile) -{ - $PublishProfileFile = "$LocalFolder\..\PublishProfiles\Local.xml" -} - -if (!$ApplicationPackagePath) -{ - $ApplicationPackagePath = "$LocalFolder\..\pkg\Release" -} - -$ApplicationPackagePath = Resolve-Path $ApplicationPackagePath - -$publishProfile = Read-PublishProfile $PublishProfileFile - -if (-not $UseExistingClusterConnection) -{ - $ClusterConnectionParameters = $publishProfile.ClusterConnectionParameters - if ($SecurityToken) - { - $ClusterConnectionParameters["SecurityToken"] = $SecurityToken - } - - try - { - [void](Connect-ServiceFabricCluster @ClusterConnectionParameters) - } - catch [System.Fabric.FabricObjectClosedException] - { - Write-Warning "Service Fabric cluster may not be connected." - throw - } -} - -$RegKey = "HKLM:\SOFTWARE\Microsoft\Service Fabric SDK" -$ModuleFolderPath = (Get-ItemProperty -Path $RegKey -Name FabricSDKPSModulePath).FabricSDKPSModulePath -Import-Module "$ModuleFolderPath\ServiceFabricSDK.psm1" - -$IsUpgrade = ($publishProfile.UpgradeDeployment -and $publishProfile.UpgradeDeployment.Enabled -and $OverrideUpgradeBehavior -ne 'VetoUpgrade') -or $OverrideUpgradeBehavior -eq 'ForceUpgrade' - -$PublishParameters = @{ - 'ApplicationPackagePath' = $ApplicationPackagePath - 'ApplicationParameterFilePath' = $publishProfile.ApplicationParameterFile - 'ApplicationParameter' = $ApplicationParameter - 'ErrorAction' = 'Stop' -} - -if ($publishProfile.CopyPackageParameters.CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $publishProfile.CopyPackageParameters.CopyPackageTimeoutSec -} - -if ($publishProfile.CopyPackageParameters.CompressPackage) -{ - $PublishParameters['CompressPackage'] = $publishProfile.CopyPackageParameters.CompressPackage -} - -# CopyPackageTimeoutSec parameter overrides the value from the publish profile -if ($CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $CopyPackageTimeoutSec -} - -if ($IsUpgrade) -{ - $Action = "RegisterAndUpgrade" - if ($DeployOnly) - { - $Action = "Register" - } - - $UpgradeParameters = $publishProfile.UpgradeDeployment.Parameters - - if ($OverrideUpgradeBehavior -eq 'ForceUpgrade') - { - # Warning: Do not alter these upgrade parameters. It will create an inconsistency with Visual Studio's behavior. - $UpgradeParameters = @{ UnmonitoredAuto = $true; Force = $true } - } - - $PublishParameters['Action'] = $Action - $PublishParameters['UpgradeParameters'] = $UpgradeParameters - $PublishParameters['UnregisterUnusedVersions'] = $UnregisterUnusedApplicationVersionsAfterUpgrade - - Publish-UpgradedServiceFabricApplication @PublishParameters -} -else -{ - $Action = "RegisterAndCreate" - if ($DeployOnly) - { - $Action = "Register" - } - - $PublishParameters['Action'] = $Action - $PublishParameters['OverwriteBehavior'] = $OverwriteBehavior - $PublishParameters['SkipPackageValidation'] = $SkipPackageValidation - - Publish-NewServiceFabricApplication @PublishParameters -} \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabric/eShopOnServiceFabric.sfproj b/ServiceFabric/Linux/eShopOnServiceFabric/eShopOnServiceFabric.sfproj deleted file mode 100644 index e345590fb..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabric/eShopOnServiceFabric.sfproj +++ /dev/null @@ -1,57 +0,0 @@ - - - - - 983eab84-65c5-4793-a300-08f97c791a15 - 1.6 - 1.5 - - - - Debug - x64 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Service Fabric Tools\Microsoft.VisualStudio.Azure.Fabric.ApplicationProject.targets - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabric/packages.config b/ServiceFabric/Linux/eShopOnServiceFabric/packages.config deleted file mode 100644 index c5f59e48e..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabric/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationPackageRoot/ApplicationManifest.xml b/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationPackageRoot/ApplicationManifest.xml deleted file mode 100644 index 638b70194..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationPackageRoot/ApplicationManifest.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationPackageRoot/IdentityApiPkg/Config/Settings.xml b/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationPackageRoot/IdentityApiPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationPackageRoot/IdentityApiPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationPackageRoot/IdentityApiPkg/ServiceManifest.xml b/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationPackageRoot/IdentityApiPkg/ServiceManifest.xml deleted file mode 100644 index 35bc15b68..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationPackageRoot/IdentityApiPkg/ServiceManifest.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - eshop/identity.api:#{tag}# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationParameters/Cloud.xml b/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationParameters/Cloud.xml deleted file mode 100644 index a1255b6c0..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationParameters/Cloud.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationParameters/Local.1Node.xml b/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationParameters/Local.1Node.xml deleted file mode 100644 index e8623180a..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationParameters/Local.1Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationParameters/Local.5Node.xml b/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationParameters/Local.5Node.xml deleted file mode 100644 index e8623180a..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationParameters/Local.5Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Cloud.xml b/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Cloud.xml deleted file mode 100644 index 2ab9df11c..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Cloud.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Local.1Node.xml b/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Local.1Node.xml deleted file mode 100644 index 6e1403e96..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Local.1Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Local.5Node.xml b/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Local.5Node.xml deleted file mode 100644 index f42d759c3..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Local.5Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/Scripts/Deploy-FabricApplication.ps1 b/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/Scripts/Deploy-FabricApplication.ps1 deleted file mode 100644 index 2897b10e8..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/Scripts/Deploy-FabricApplication.ps1 +++ /dev/null @@ -1,258 +0,0 @@ -<# -.SYNOPSIS -Deploys a Service Fabric application type to a cluster. - -.DESCRIPTION -This script deploys a Service Fabric application type to a cluster. It is invoked by Visual Studio when deploying a Service Fabric Application project. - -.NOTES -WARNING: This script file is invoked by Visual Studio. Its parameters must not be altered but its logic can be customized as necessary. - -.PARAMETER PublishProfileFile -Path to the file containing the publish profile. - -.PARAMETER ApplicationPackagePath -Path to the folder of the packaged Service Fabric application. - -.PARAMETER DeployOnly -Indicates that the Service Fabric application should not be created or upgraded after registering the application type. - -.PARAMETER ApplicationParameter -Hashtable of the Service Fabric application parameters to be used for the application. - -.PARAMETER UnregisterUnusedApplicationVersionsAfterUpgrade -Indicates whether to unregister any unused application versions that exist after an upgrade is finished. - -.PARAMETER OverrideUpgradeBehavior -Indicates the behavior used to override the upgrade settings specified by the publish profile. -'None' indicates that the upgrade settings will not be overridden. -'ForceUpgrade' indicates that an upgrade will occur with default settings, regardless of what is specified in the publish profile. -'VetoUpgrade' indicates that an upgrade will not occur, regardless of what is specified in the publish profile. - -.PARAMETER UseExistingClusterConnection -Indicates that the script should make use of an existing cluster connection that has already been established in the PowerShell session. The cluster connection parameters configured in the publish profile are ignored. - -.PARAMETER OverwriteBehavior -Overwrite Behavior if an application exists in the cluster with the same name. Available Options are Never, Always, SameAppTypeAndVersion. This setting is not applicable when upgrading an application. -'Never' will not remove the existing application. This is the default behavior. -'Always' will remove the existing application even if its Application type and Version is different from the application being created. -'SameAppTypeAndVersion' will remove the existing application only if its Application type and Version is same as the application being created. - -.PARAMETER SkipPackageValidation -Switch signaling whether the package should be validated or not before deployment. - -.PARAMETER SecurityToken -A security token for authentication to cluster management endpoints. Used for silent authentication to clusters that are protected by Azure Active Directory. - -.PARAMETER CopyPackageTimeoutSec -Timeout in seconds for copying application package to image store. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' - -Deploy the application using the default package location for a Debug build. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -DoNotCreateApplication - -Deploy the application but do not create the application instance. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -ApplicationParameter @{CustomParameter1='MyValue'; CustomParameter2='MyValue'} - -Deploy the application by providing values for parameters that are defined in the application manifest. -#> - -Param -( - [String] - $PublishProfileFile, - - [String] - $ApplicationPackagePath, - - [Switch] - $DeployOnly, - - [Hashtable] - $ApplicationParameter, - - [Boolean] - $UnregisterUnusedApplicationVersionsAfterUpgrade, - - [String] - [ValidateSet('None', 'ForceUpgrade', 'VetoUpgrade')] - $OverrideUpgradeBehavior = 'None', - - [Switch] - $UseExistingClusterConnection, - - [String] - [ValidateSet('Never','Always','SameAppTypeAndVersion')] - $OverwriteBehavior = 'Never', - - [Switch] - $SkipPackageValidation, - - [String] - $SecurityToken, - - [int] - $CopyPackageTimeoutSec -) - -function Read-XmlElementAsHashtable -{ - Param ( - [System.Xml.XmlElement] - $Element - ) - - $hashtable = @{} - if ($Element.Attributes) - { - $Element.Attributes | - ForEach-Object { - $boolVal = $null - if ([bool]::TryParse($_.Value, [ref]$boolVal)) { - $hashtable[$_.Name] = $boolVal - } - else { - $hashtable[$_.Name] = $_.Value - } - } - } - - return $hashtable -} - -function Read-PublishProfile -{ - Param ( - [ValidateScript({Test-Path $_ -PathType Leaf})] - [String] - $PublishProfileFile - ) - - $publishProfileXml = [Xml] (Get-Content $PublishProfileFile) - $publishProfile = @{} - - $publishProfile.ClusterConnectionParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("ClusterConnectionParameters") - $publishProfile.UpgradeDeployment = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment") - $publishProfile.CopyPackageParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("CopyPackageParameters") - - if ($publishProfileXml.PublishProfile.Item("UpgradeDeployment")) - { - $publishProfile.UpgradeDeployment.Parameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment").Item("Parameters") - if ($publishProfile.UpgradeDeployment["Mode"]) - { - $publishProfile.UpgradeDeployment.Parameters[$publishProfile.UpgradeDeployment["Mode"]] = $true - } - } - - $publishProfileFolder = (Split-Path $PublishProfileFile) - $publishProfile.ApplicationParameterFile = [System.IO.Path]::Combine($PublishProfileFolder, $publishProfileXml.PublishProfile.ApplicationParameterFile.Path) - - return $publishProfile -} - -$LocalFolder = (Split-Path $MyInvocation.MyCommand.Path) - -if (!$PublishProfileFile) -{ - $PublishProfileFile = "$LocalFolder\..\PublishProfiles\Local.xml" -} - -if (!$ApplicationPackagePath) -{ - $ApplicationPackagePath = "$LocalFolder\..\pkg\Release" -} - -$ApplicationPackagePath = Resolve-Path $ApplicationPackagePath - -$publishProfile = Read-PublishProfile $PublishProfileFile - -if (-not $UseExistingClusterConnection) -{ - $ClusterConnectionParameters = $publishProfile.ClusterConnectionParameters - if ($SecurityToken) - { - $ClusterConnectionParameters["SecurityToken"] = $SecurityToken - } - - try - { - [void](Connect-ServiceFabricCluster @ClusterConnectionParameters) - } - catch [System.Fabric.FabricObjectClosedException] - { - Write-Warning "Service Fabric cluster may not be connected." - throw - } -} - -$RegKey = "HKLM:\SOFTWARE\Microsoft\Service Fabric SDK" -$ModuleFolderPath = (Get-ItemProperty -Path $RegKey -Name FabricSDKPSModulePath).FabricSDKPSModulePath -Import-Module "$ModuleFolderPath\ServiceFabricSDK.psm1" - -$IsUpgrade = ($publishProfile.UpgradeDeployment -and $publishProfile.UpgradeDeployment.Enabled -and $OverrideUpgradeBehavior -ne 'VetoUpgrade') -or $OverrideUpgradeBehavior -eq 'ForceUpgrade' - -$PublishParameters = @{ - 'ApplicationPackagePath' = $ApplicationPackagePath - 'ApplicationParameterFilePath' = $publishProfile.ApplicationParameterFile - 'ApplicationParameter' = $ApplicationParameter - 'ErrorAction' = 'Stop' -} - -if ($publishProfile.CopyPackageParameters.CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $publishProfile.CopyPackageParameters.CopyPackageTimeoutSec -} - -if ($publishProfile.CopyPackageParameters.CompressPackage) -{ - $PublishParameters['CompressPackage'] = $publishProfile.CopyPackageParameters.CompressPackage -} - -# CopyPackageTimeoutSec parameter overrides the value from the publish profile -if ($CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $CopyPackageTimeoutSec -} - -if ($IsUpgrade) -{ - $Action = "RegisterAndUpgrade" - if ($DeployOnly) - { - $Action = "Register" - } - - $UpgradeParameters = $publishProfile.UpgradeDeployment.Parameters - - if ($OverrideUpgradeBehavior -eq 'ForceUpgrade') - { - # Warning: Do not alter these upgrade parameters. It will create an inconsistency with Visual Studio's behavior. - $UpgradeParameters = @{ UnmonitoredAuto = $true; Force = $true } - } - - $PublishParameters['Action'] = $Action - $PublishParameters['UpgradeParameters'] = $UpgradeParameters - $PublishParameters['UnregisterUnusedVersions'] = $UnregisterUnusedApplicationVersionsAfterUpgrade - - Publish-UpgradedServiceFabricApplication @PublishParameters -} -else -{ - $Action = "RegisterAndCreate" - if ($DeployOnly) - { - $Action = "Register" - } - - $PublishParameters['Action'] = $Action - $PublishParameters['OverwriteBehavior'] = $OverwriteBehavior - $PublishParameters['SkipPackageValidation'] = $SkipPackageValidation - - Publish-NewServiceFabricApplication @PublishParameters -} \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv.sfproj b/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv.sfproj deleted file mode 100644 index 1d0d025a9..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv.sfproj +++ /dev/null @@ -1,46 +0,0 @@ - - - - - 39b54901-d57d-416e-b51e-33c4017ca464 - 1.7 - 1.5 - 1.6 - v4.6.1 - - - - Debug - x64 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Service Fabric Tools\Microsoft.VisualStudio.Azure.Fabric.ApplicationProject.targets - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/packages.config b/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/packages.config deleted file mode 100644 index 3dc0a332b..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/ApplicationManifest.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/ApplicationManifest.xml deleted file mode 100644 index 158c03905..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/ApplicationManifest.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/WebMVCPkg/Config/Settings.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/WebMVCPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/WebMVCPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/WebMVCPkg/ServiceManifest.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/WebMVCPkg/ServiceManifest.xml deleted file mode 100644 index 7b6aa5565..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/WebMVCPkg/ServiceManifest.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - eshop/webmvc:#{tag}# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationParameters/Cloud.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationParameters/Cloud.xml deleted file mode 100644 index d99e1573a..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationParameters/Cloud.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationParameters/Local.1Node.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationParameters/Local.1Node.xml deleted file mode 100644 index 1d59af5a6..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationParameters/Local.1Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationParameters/Local.5Node.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationParameters/Local.5Node.xml deleted file mode 100644 index 1d59af5a6..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationParameters/Local.5Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Cloud.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Cloud.xml deleted file mode 100644 index 2ab9df11c..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Cloud.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Local.1Node.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Local.1Node.xml deleted file mode 100644 index 6e1403e96..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Local.1Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Local.5Node.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Local.5Node.xml deleted file mode 100644 index f42d759c3..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Local.5Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/Scripts/Deploy-FabricApplication.ps1 b/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/Scripts/Deploy-FabricApplication.ps1 deleted file mode 100644 index 2897b10e8..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/Scripts/Deploy-FabricApplication.ps1 +++ /dev/null @@ -1,258 +0,0 @@ -<# -.SYNOPSIS -Deploys a Service Fabric application type to a cluster. - -.DESCRIPTION -This script deploys a Service Fabric application type to a cluster. It is invoked by Visual Studio when deploying a Service Fabric Application project. - -.NOTES -WARNING: This script file is invoked by Visual Studio. Its parameters must not be altered but its logic can be customized as necessary. - -.PARAMETER PublishProfileFile -Path to the file containing the publish profile. - -.PARAMETER ApplicationPackagePath -Path to the folder of the packaged Service Fabric application. - -.PARAMETER DeployOnly -Indicates that the Service Fabric application should not be created or upgraded after registering the application type. - -.PARAMETER ApplicationParameter -Hashtable of the Service Fabric application parameters to be used for the application. - -.PARAMETER UnregisterUnusedApplicationVersionsAfterUpgrade -Indicates whether to unregister any unused application versions that exist after an upgrade is finished. - -.PARAMETER OverrideUpgradeBehavior -Indicates the behavior used to override the upgrade settings specified by the publish profile. -'None' indicates that the upgrade settings will not be overridden. -'ForceUpgrade' indicates that an upgrade will occur with default settings, regardless of what is specified in the publish profile. -'VetoUpgrade' indicates that an upgrade will not occur, regardless of what is specified in the publish profile. - -.PARAMETER UseExistingClusterConnection -Indicates that the script should make use of an existing cluster connection that has already been established in the PowerShell session. The cluster connection parameters configured in the publish profile are ignored. - -.PARAMETER OverwriteBehavior -Overwrite Behavior if an application exists in the cluster with the same name. Available Options are Never, Always, SameAppTypeAndVersion. This setting is not applicable when upgrading an application. -'Never' will not remove the existing application. This is the default behavior. -'Always' will remove the existing application even if its Application type and Version is different from the application being created. -'SameAppTypeAndVersion' will remove the existing application only if its Application type and Version is same as the application being created. - -.PARAMETER SkipPackageValidation -Switch signaling whether the package should be validated or not before deployment. - -.PARAMETER SecurityToken -A security token for authentication to cluster management endpoints. Used for silent authentication to clusters that are protected by Azure Active Directory. - -.PARAMETER CopyPackageTimeoutSec -Timeout in seconds for copying application package to image store. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' - -Deploy the application using the default package location for a Debug build. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -DoNotCreateApplication - -Deploy the application but do not create the application instance. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -ApplicationParameter @{CustomParameter1='MyValue'; CustomParameter2='MyValue'} - -Deploy the application by providing values for parameters that are defined in the application manifest. -#> - -Param -( - [String] - $PublishProfileFile, - - [String] - $ApplicationPackagePath, - - [Switch] - $DeployOnly, - - [Hashtable] - $ApplicationParameter, - - [Boolean] - $UnregisterUnusedApplicationVersionsAfterUpgrade, - - [String] - [ValidateSet('None', 'ForceUpgrade', 'VetoUpgrade')] - $OverrideUpgradeBehavior = 'None', - - [Switch] - $UseExistingClusterConnection, - - [String] - [ValidateSet('Never','Always','SameAppTypeAndVersion')] - $OverwriteBehavior = 'Never', - - [Switch] - $SkipPackageValidation, - - [String] - $SecurityToken, - - [int] - $CopyPackageTimeoutSec -) - -function Read-XmlElementAsHashtable -{ - Param ( - [System.Xml.XmlElement] - $Element - ) - - $hashtable = @{} - if ($Element.Attributes) - { - $Element.Attributes | - ForEach-Object { - $boolVal = $null - if ([bool]::TryParse($_.Value, [ref]$boolVal)) { - $hashtable[$_.Name] = $boolVal - } - else { - $hashtable[$_.Name] = $_.Value - } - } - } - - return $hashtable -} - -function Read-PublishProfile -{ - Param ( - [ValidateScript({Test-Path $_ -PathType Leaf})] - [String] - $PublishProfileFile - ) - - $publishProfileXml = [Xml] (Get-Content $PublishProfileFile) - $publishProfile = @{} - - $publishProfile.ClusterConnectionParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("ClusterConnectionParameters") - $publishProfile.UpgradeDeployment = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment") - $publishProfile.CopyPackageParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("CopyPackageParameters") - - if ($publishProfileXml.PublishProfile.Item("UpgradeDeployment")) - { - $publishProfile.UpgradeDeployment.Parameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment").Item("Parameters") - if ($publishProfile.UpgradeDeployment["Mode"]) - { - $publishProfile.UpgradeDeployment.Parameters[$publishProfile.UpgradeDeployment["Mode"]] = $true - } - } - - $publishProfileFolder = (Split-Path $PublishProfileFile) - $publishProfile.ApplicationParameterFile = [System.IO.Path]::Combine($PublishProfileFolder, $publishProfileXml.PublishProfile.ApplicationParameterFile.Path) - - return $publishProfile -} - -$LocalFolder = (Split-Path $MyInvocation.MyCommand.Path) - -if (!$PublishProfileFile) -{ - $PublishProfileFile = "$LocalFolder\..\PublishProfiles\Local.xml" -} - -if (!$ApplicationPackagePath) -{ - $ApplicationPackagePath = "$LocalFolder\..\pkg\Release" -} - -$ApplicationPackagePath = Resolve-Path $ApplicationPackagePath - -$publishProfile = Read-PublishProfile $PublishProfileFile - -if (-not $UseExistingClusterConnection) -{ - $ClusterConnectionParameters = $publishProfile.ClusterConnectionParameters - if ($SecurityToken) - { - $ClusterConnectionParameters["SecurityToken"] = $SecurityToken - } - - try - { - [void](Connect-ServiceFabricCluster @ClusterConnectionParameters) - } - catch [System.Fabric.FabricObjectClosedException] - { - Write-Warning "Service Fabric cluster may not be connected." - throw - } -} - -$RegKey = "HKLM:\SOFTWARE\Microsoft\Service Fabric SDK" -$ModuleFolderPath = (Get-ItemProperty -Path $RegKey -Name FabricSDKPSModulePath).FabricSDKPSModulePath -Import-Module "$ModuleFolderPath\ServiceFabricSDK.psm1" - -$IsUpgrade = ($publishProfile.UpgradeDeployment -and $publishProfile.UpgradeDeployment.Enabled -and $OverrideUpgradeBehavior -ne 'VetoUpgrade') -or $OverrideUpgradeBehavior -eq 'ForceUpgrade' - -$PublishParameters = @{ - 'ApplicationPackagePath' = $ApplicationPackagePath - 'ApplicationParameterFilePath' = $publishProfile.ApplicationParameterFile - 'ApplicationParameter' = $ApplicationParameter - 'ErrorAction' = 'Stop' -} - -if ($publishProfile.CopyPackageParameters.CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $publishProfile.CopyPackageParameters.CopyPackageTimeoutSec -} - -if ($publishProfile.CopyPackageParameters.CompressPackage) -{ - $PublishParameters['CompressPackage'] = $publishProfile.CopyPackageParameters.CompressPackage -} - -# CopyPackageTimeoutSec parameter overrides the value from the publish profile -if ($CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $CopyPackageTimeoutSec -} - -if ($IsUpgrade) -{ - $Action = "RegisterAndUpgrade" - if ($DeployOnly) - { - $Action = "Register" - } - - $UpgradeParameters = $publishProfile.UpgradeDeployment.Parameters - - if ($OverrideUpgradeBehavior -eq 'ForceUpgrade') - { - # Warning: Do not alter these upgrade parameters. It will create an inconsistency with Visual Studio's behavior. - $UpgradeParameters = @{ UnmonitoredAuto = $true; Force = $true } - } - - $PublishParameters['Action'] = $Action - $PublishParameters['UpgradeParameters'] = $UpgradeParameters - $PublishParameters['UnregisterUnusedVersions'] = $UnregisterUnusedApplicationVersionsAfterUpgrade - - Publish-UpgradedServiceFabricApplication @PublishParameters -} -else -{ - $Action = "RegisterAndCreate" - if ($DeployOnly) - { - $Action = "Register" - } - - $PublishParameters['Action'] = $Action - $PublishParameters['OverwriteBehavior'] = $OverwriteBehavior - $PublishParameters['SkipPackageValidation'] = $SkipPackageValidation - - Publish-NewServiceFabricApplication @PublishParameters -} \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC.sfproj b/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC.sfproj deleted file mode 100644 index ff4ce2247..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC.sfproj +++ /dev/null @@ -1,46 +0,0 @@ - - - - - 0cf895ff-3616-4d1f-8d2e-5d856cdf3612 - 1.7 - 1.5 - 1.6 - v4.6.1 - - - - Debug - x64 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Service Fabric Tools\Microsoft.VisualStudio.Azure.Fabric.ApplicationProject.targets - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/packages.config b/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/packages.config deleted file mode 100644 index 3dc0a332b..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/ApplicationManifest.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/ApplicationManifest.xml deleted file mode 100644 index 7fca0294e..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/ApplicationManifest.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/WebSPAPkg/Config/Settings.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/WebSPAPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/WebSPAPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml deleted file mode 100644 index 64d719c59..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - eshop/webspa:#{tag}# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationParameters/Cloud.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationParameters/Cloud.xml deleted file mode 100644 index fdeb6fd88..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationParameters/Cloud.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationParameters/Local.1Node.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationParameters/Local.1Node.xml deleted file mode 100644 index 92fe692c3..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationParameters/Local.1Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationParameters/Local.5Node.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationParameters/Local.5Node.xml deleted file mode 100644 index 92fe692c3..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationParameters/Local.5Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Cloud.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Cloud.xml deleted file mode 100644 index 2ab9df11c..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Cloud.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Local.1Node.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Local.1Node.xml deleted file mode 100644 index 6e1403e96..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Local.1Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Local.5Node.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Local.5Node.xml deleted file mode 100644 index f42d759c3..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Local.5Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/Scripts/Deploy-FabricApplication.ps1 b/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/Scripts/Deploy-FabricApplication.ps1 deleted file mode 100644 index 2897b10e8..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/Scripts/Deploy-FabricApplication.ps1 +++ /dev/null @@ -1,258 +0,0 @@ -<# -.SYNOPSIS -Deploys a Service Fabric application type to a cluster. - -.DESCRIPTION -This script deploys a Service Fabric application type to a cluster. It is invoked by Visual Studio when deploying a Service Fabric Application project. - -.NOTES -WARNING: This script file is invoked by Visual Studio. Its parameters must not be altered but its logic can be customized as necessary. - -.PARAMETER PublishProfileFile -Path to the file containing the publish profile. - -.PARAMETER ApplicationPackagePath -Path to the folder of the packaged Service Fabric application. - -.PARAMETER DeployOnly -Indicates that the Service Fabric application should not be created or upgraded after registering the application type. - -.PARAMETER ApplicationParameter -Hashtable of the Service Fabric application parameters to be used for the application. - -.PARAMETER UnregisterUnusedApplicationVersionsAfterUpgrade -Indicates whether to unregister any unused application versions that exist after an upgrade is finished. - -.PARAMETER OverrideUpgradeBehavior -Indicates the behavior used to override the upgrade settings specified by the publish profile. -'None' indicates that the upgrade settings will not be overridden. -'ForceUpgrade' indicates that an upgrade will occur with default settings, regardless of what is specified in the publish profile. -'VetoUpgrade' indicates that an upgrade will not occur, regardless of what is specified in the publish profile. - -.PARAMETER UseExistingClusterConnection -Indicates that the script should make use of an existing cluster connection that has already been established in the PowerShell session. The cluster connection parameters configured in the publish profile are ignored. - -.PARAMETER OverwriteBehavior -Overwrite Behavior if an application exists in the cluster with the same name. Available Options are Never, Always, SameAppTypeAndVersion. This setting is not applicable when upgrading an application. -'Never' will not remove the existing application. This is the default behavior. -'Always' will remove the existing application even if its Application type and Version is different from the application being created. -'SameAppTypeAndVersion' will remove the existing application only if its Application type and Version is same as the application being created. - -.PARAMETER SkipPackageValidation -Switch signaling whether the package should be validated or not before deployment. - -.PARAMETER SecurityToken -A security token for authentication to cluster management endpoints. Used for silent authentication to clusters that are protected by Azure Active Directory. - -.PARAMETER CopyPackageTimeoutSec -Timeout in seconds for copying application package to image store. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' - -Deploy the application using the default package location for a Debug build. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -DoNotCreateApplication - -Deploy the application but do not create the application instance. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -ApplicationParameter @{CustomParameter1='MyValue'; CustomParameter2='MyValue'} - -Deploy the application by providing values for parameters that are defined in the application manifest. -#> - -Param -( - [String] - $PublishProfileFile, - - [String] - $ApplicationPackagePath, - - [Switch] - $DeployOnly, - - [Hashtable] - $ApplicationParameter, - - [Boolean] - $UnregisterUnusedApplicationVersionsAfterUpgrade, - - [String] - [ValidateSet('None', 'ForceUpgrade', 'VetoUpgrade')] - $OverrideUpgradeBehavior = 'None', - - [Switch] - $UseExistingClusterConnection, - - [String] - [ValidateSet('Never','Always','SameAppTypeAndVersion')] - $OverwriteBehavior = 'Never', - - [Switch] - $SkipPackageValidation, - - [String] - $SecurityToken, - - [int] - $CopyPackageTimeoutSec -) - -function Read-XmlElementAsHashtable -{ - Param ( - [System.Xml.XmlElement] - $Element - ) - - $hashtable = @{} - if ($Element.Attributes) - { - $Element.Attributes | - ForEach-Object { - $boolVal = $null - if ([bool]::TryParse($_.Value, [ref]$boolVal)) { - $hashtable[$_.Name] = $boolVal - } - else { - $hashtable[$_.Name] = $_.Value - } - } - } - - return $hashtable -} - -function Read-PublishProfile -{ - Param ( - [ValidateScript({Test-Path $_ -PathType Leaf})] - [String] - $PublishProfileFile - ) - - $publishProfileXml = [Xml] (Get-Content $PublishProfileFile) - $publishProfile = @{} - - $publishProfile.ClusterConnectionParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("ClusterConnectionParameters") - $publishProfile.UpgradeDeployment = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment") - $publishProfile.CopyPackageParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("CopyPackageParameters") - - if ($publishProfileXml.PublishProfile.Item("UpgradeDeployment")) - { - $publishProfile.UpgradeDeployment.Parameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment").Item("Parameters") - if ($publishProfile.UpgradeDeployment["Mode"]) - { - $publishProfile.UpgradeDeployment.Parameters[$publishProfile.UpgradeDeployment["Mode"]] = $true - } - } - - $publishProfileFolder = (Split-Path $PublishProfileFile) - $publishProfile.ApplicationParameterFile = [System.IO.Path]::Combine($PublishProfileFolder, $publishProfileXml.PublishProfile.ApplicationParameterFile.Path) - - return $publishProfile -} - -$LocalFolder = (Split-Path $MyInvocation.MyCommand.Path) - -if (!$PublishProfileFile) -{ - $PublishProfileFile = "$LocalFolder\..\PublishProfiles\Local.xml" -} - -if (!$ApplicationPackagePath) -{ - $ApplicationPackagePath = "$LocalFolder\..\pkg\Release" -} - -$ApplicationPackagePath = Resolve-Path $ApplicationPackagePath - -$publishProfile = Read-PublishProfile $PublishProfileFile - -if (-not $UseExistingClusterConnection) -{ - $ClusterConnectionParameters = $publishProfile.ClusterConnectionParameters - if ($SecurityToken) - { - $ClusterConnectionParameters["SecurityToken"] = $SecurityToken - } - - try - { - [void](Connect-ServiceFabricCluster @ClusterConnectionParameters) - } - catch [System.Fabric.FabricObjectClosedException] - { - Write-Warning "Service Fabric cluster may not be connected." - throw - } -} - -$RegKey = "HKLM:\SOFTWARE\Microsoft\Service Fabric SDK" -$ModuleFolderPath = (Get-ItemProperty -Path $RegKey -Name FabricSDKPSModulePath).FabricSDKPSModulePath -Import-Module "$ModuleFolderPath\ServiceFabricSDK.psm1" - -$IsUpgrade = ($publishProfile.UpgradeDeployment -and $publishProfile.UpgradeDeployment.Enabled -and $OverrideUpgradeBehavior -ne 'VetoUpgrade') -or $OverrideUpgradeBehavior -eq 'ForceUpgrade' - -$PublishParameters = @{ - 'ApplicationPackagePath' = $ApplicationPackagePath - 'ApplicationParameterFilePath' = $publishProfile.ApplicationParameterFile - 'ApplicationParameter' = $ApplicationParameter - 'ErrorAction' = 'Stop' -} - -if ($publishProfile.CopyPackageParameters.CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $publishProfile.CopyPackageParameters.CopyPackageTimeoutSec -} - -if ($publishProfile.CopyPackageParameters.CompressPackage) -{ - $PublishParameters['CompressPackage'] = $publishProfile.CopyPackageParameters.CompressPackage -} - -# CopyPackageTimeoutSec parameter overrides the value from the publish profile -if ($CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $CopyPackageTimeoutSec -} - -if ($IsUpgrade) -{ - $Action = "RegisterAndUpgrade" - if ($DeployOnly) - { - $Action = "Register" - } - - $UpgradeParameters = $publishProfile.UpgradeDeployment.Parameters - - if ($OverrideUpgradeBehavior -eq 'ForceUpgrade') - { - # Warning: Do not alter these upgrade parameters. It will create an inconsistency with Visual Studio's behavior. - $UpgradeParameters = @{ UnmonitoredAuto = $true; Force = $true } - } - - $PublishParameters['Action'] = $Action - $PublishParameters['UpgradeParameters'] = $UpgradeParameters - $PublishParameters['UnregisterUnusedVersions'] = $UnregisterUnusedApplicationVersionsAfterUpgrade - - Publish-UpgradedServiceFabricApplication @PublishParameters -} -else -{ - $Action = "RegisterAndCreate" - if ($DeployOnly) - { - $Action = "Register" - } - - $PublishParameters['Action'] = $Action - $PublishParameters['OverwriteBehavior'] = $OverwriteBehavior - $PublishParameters['SkipPackageValidation'] = $SkipPackageValidation - - Publish-NewServiceFabricApplication @PublishParameters -} \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA.sfproj b/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA.sfproj deleted file mode 100644 index 05ed606be..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA.sfproj +++ /dev/null @@ -1,46 +0,0 @@ - - - - - 1670de10-5626-429d-a74a-2dd8281cc0c9 - 1.7 - 1.5 - 1.6 - v4.6.1 - - - - Debug - x64 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Service Fabric Tools\Microsoft.VisualStudio.Azure.Fabric.ApplicationProject.targets - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/packages.config b/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/packages.config deleted file mode 100644 index 3dc0a332b..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/ApplicationManifest.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/ApplicationManifest.xml deleted file mode 100644 index da2d7de0b..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/ApplicationManifest.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/WebStatusPkg/Config/Settings.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/WebStatusPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/WebStatusPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/WebStatusPkg/ServiceManifest.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/WebStatusPkg/ServiceManifest.xml deleted file mode 100644 index 456c92ea1..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/WebStatusPkg/ServiceManifest.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - eshop/webstatus:#{tag}# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationParameters/Cloud.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationParameters/Cloud.xml deleted file mode 100644 index f49e04e6b..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationParameters/Cloud.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationParameters/Local.1Node.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationParameters/Local.1Node.xml deleted file mode 100644 index 9864bd050..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationParameters/Local.1Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationParameters/Local.5Node.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationParameters/Local.5Node.xml deleted file mode 100644 index 9864bd050..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationParameters/Local.5Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Cloud.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Cloud.xml deleted file mode 100644 index 2ab9df11c..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Cloud.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Local.1Node.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Local.1Node.xml deleted file mode 100644 index 6e1403e96..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Local.1Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Local.5Node.xml b/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Local.5Node.xml deleted file mode 100644 index f42d759c3..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Local.5Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/Scripts/Deploy-FabricApplication.ps1 b/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/Scripts/Deploy-FabricApplication.ps1 deleted file mode 100644 index 2897b10e8..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/Scripts/Deploy-FabricApplication.ps1 +++ /dev/null @@ -1,258 +0,0 @@ -<# -.SYNOPSIS -Deploys a Service Fabric application type to a cluster. - -.DESCRIPTION -This script deploys a Service Fabric application type to a cluster. It is invoked by Visual Studio when deploying a Service Fabric Application project. - -.NOTES -WARNING: This script file is invoked by Visual Studio. Its parameters must not be altered but its logic can be customized as necessary. - -.PARAMETER PublishProfileFile -Path to the file containing the publish profile. - -.PARAMETER ApplicationPackagePath -Path to the folder of the packaged Service Fabric application. - -.PARAMETER DeployOnly -Indicates that the Service Fabric application should not be created or upgraded after registering the application type. - -.PARAMETER ApplicationParameter -Hashtable of the Service Fabric application parameters to be used for the application. - -.PARAMETER UnregisterUnusedApplicationVersionsAfterUpgrade -Indicates whether to unregister any unused application versions that exist after an upgrade is finished. - -.PARAMETER OverrideUpgradeBehavior -Indicates the behavior used to override the upgrade settings specified by the publish profile. -'None' indicates that the upgrade settings will not be overridden. -'ForceUpgrade' indicates that an upgrade will occur with default settings, regardless of what is specified in the publish profile. -'VetoUpgrade' indicates that an upgrade will not occur, regardless of what is specified in the publish profile. - -.PARAMETER UseExistingClusterConnection -Indicates that the script should make use of an existing cluster connection that has already been established in the PowerShell session. The cluster connection parameters configured in the publish profile are ignored. - -.PARAMETER OverwriteBehavior -Overwrite Behavior if an application exists in the cluster with the same name. Available Options are Never, Always, SameAppTypeAndVersion. This setting is not applicable when upgrading an application. -'Never' will not remove the existing application. This is the default behavior. -'Always' will remove the existing application even if its Application type and Version is different from the application being created. -'SameAppTypeAndVersion' will remove the existing application only if its Application type and Version is same as the application being created. - -.PARAMETER SkipPackageValidation -Switch signaling whether the package should be validated or not before deployment. - -.PARAMETER SecurityToken -A security token for authentication to cluster management endpoints. Used for silent authentication to clusters that are protected by Azure Active Directory. - -.PARAMETER CopyPackageTimeoutSec -Timeout in seconds for copying application package to image store. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' - -Deploy the application using the default package location for a Debug build. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -DoNotCreateApplication - -Deploy the application but do not create the application instance. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -ApplicationParameter @{CustomParameter1='MyValue'; CustomParameter2='MyValue'} - -Deploy the application by providing values for parameters that are defined in the application manifest. -#> - -Param -( - [String] - $PublishProfileFile, - - [String] - $ApplicationPackagePath, - - [Switch] - $DeployOnly, - - [Hashtable] - $ApplicationParameter, - - [Boolean] - $UnregisterUnusedApplicationVersionsAfterUpgrade, - - [String] - [ValidateSet('None', 'ForceUpgrade', 'VetoUpgrade')] - $OverrideUpgradeBehavior = 'None', - - [Switch] - $UseExistingClusterConnection, - - [String] - [ValidateSet('Never','Always','SameAppTypeAndVersion')] - $OverwriteBehavior = 'Never', - - [Switch] - $SkipPackageValidation, - - [String] - $SecurityToken, - - [int] - $CopyPackageTimeoutSec -) - -function Read-XmlElementAsHashtable -{ - Param ( - [System.Xml.XmlElement] - $Element - ) - - $hashtable = @{} - if ($Element.Attributes) - { - $Element.Attributes | - ForEach-Object { - $boolVal = $null - if ([bool]::TryParse($_.Value, [ref]$boolVal)) { - $hashtable[$_.Name] = $boolVal - } - else { - $hashtable[$_.Name] = $_.Value - } - } - } - - return $hashtable -} - -function Read-PublishProfile -{ - Param ( - [ValidateScript({Test-Path $_ -PathType Leaf})] - [String] - $PublishProfileFile - ) - - $publishProfileXml = [Xml] (Get-Content $PublishProfileFile) - $publishProfile = @{} - - $publishProfile.ClusterConnectionParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("ClusterConnectionParameters") - $publishProfile.UpgradeDeployment = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment") - $publishProfile.CopyPackageParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("CopyPackageParameters") - - if ($publishProfileXml.PublishProfile.Item("UpgradeDeployment")) - { - $publishProfile.UpgradeDeployment.Parameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment").Item("Parameters") - if ($publishProfile.UpgradeDeployment["Mode"]) - { - $publishProfile.UpgradeDeployment.Parameters[$publishProfile.UpgradeDeployment["Mode"]] = $true - } - } - - $publishProfileFolder = (Split-Path $PublishProfileFile) - $publishProfile.ApplicationParameterFile = [System.IO.Path]::Combine($PublishProfileFolder, $publishProfileXml.PublishProfile.ApplicationParameterFile.Path) - - return $publishProfile -} - -$LocalFolder = (Split-Path $MyInvocation.MyCommand.Path) - -if (!$PublishProfileFile) -{ - $PublishProfileFile = "$LocalFolder\..\PublishProfiles\Local.xml" -} - -if (!$ApplicationPackagePath) -{ - $ApplicationPackagePath = "$LocalFolder\..\pkg\Release" -} - -$ApplicationPackagePath = Resolve-Path $ApplicationPackagePath - -$publishProfile = Read-PublishProfile $PublishProfileFile - -if (-not $UseExistingClusterConnection) -{ - $ClusterConnectionParameters = $publishProfile.ClusterConnectionParameters - if ($SecurityToken) - { - $ClusterConnectionParameters["SecurityToken"] = $SecurityToken - } - - try - { - [void](Connect-ServiceFabricCluster @ClusterConnectionParameters) - } - catch [System.Fabric.FabricObjectClosedException] - { - Write-Warning "Service Fabric cluster may not be connected." - throw - } -} - -$RegKey = "HKLM:\SOFTWARE\Microsoft\Service Fabric SDK" -$ModuleFolderPath = (Get-ItemProperty -Path $RegKey -Name FabricSDKPSModulePath).FabricSDKPSModulePath -Import-Module "$ModuleFolderPath\ServiceFabricSDK.psm1" - -$IsUpgrade = ($publishProfile.UpgradeDeployment -and $publishProfile.UpgradeDeployment.Enabled -and $OverrideUpgradeBehavior -ne 'VetoUpgrade') -or $OverrideUpgradeBehavior -eq 'ForceUpgrade' - -$PublishParameters = @{ - 'ApplicationPackagePath' = $ApplicationPackagePath - 'ApplicationParameterFilePath' = $publishProfile.ApplicationParameterFile - 'ApplicationParameter' = $ApplicationParameter - 'ErrorAction' = 'Stop' -} - -if ($publishProfile.CopyPackageParameters.CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $publishProfile.CopyPackageParameters.CopyPackageTimeoutSec -} - -if ($publishProfile.CopyPackageParameters.CompressPackage) -{ - $PublishParameters['CompressPackage'] = $publishProfile.CopyPackageParameters.CompressPackage -} - -# CopyPackageTimeoutSec parameter overrides the value from the publish profile -if ($CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $CopyPackageTimeoutSec -} - -if ($IsUpgrade) -{ - $Action = "RegisterAndUpgrade" - if ($DeployOnly) - { - $Action = "Register" - } - - $UpgradeParameters = $publishProfile.UpgradeDeployment.Parameters - - if ($OverrideUpgradeBehavior -eq 'ForceUpgrade') - { - # Warning: Do not alter these upgrade parameters. It will create an inconsistency with Visual Studio's behavior. - $UpgradeParameters = @{ UnmonitoredAuto = $true; Force = $true } - } - - $PublishParameters['Action'] = $Action - $PublishParameters['UpgradeParameters'] = $UpgradeParameters - $PublishParameters['UnregisterUnusedVersions'] = $UnregisterUnusedApplicationVersionsAfterUpgrade - - Publish-UpgradedServiceFabricApplication @PublishParameters -} -else -{ - $Action = "RegisterAndCreate" - if ($DeployOnly) - { - $Action = "Register" - } - - $PublishParameters['Action'] = $Action - $PublishParameters['OverwriteBehavior'] = $OverwriteBehavior - $PublishParameters['SkipPackageValidation'] = $SkipPackageValidation - - Publish-NewServiceFabricApplication @PublishParameters -} \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus.sfproj b/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus.sfproj deleted file mode 100644 index 1d4def7f2..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus.sfproj +++ /dev/null @@ -1,46 +0,0 @@ - - - - - 25f73fd9-b32f-401a-80e8-17c72606a7e1 - 1.7 - 1.5 - 1.6 - v4.6.1 - - - - Debug - x64 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Service Fabric Tools\Microsoft.VisualStudio.Azure.Fabric.ApplicationProject.targets - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/packages.config b/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/packages.config deleted file mode 100644 index 3dc0a332b..000000000 --- a/ServiceFabric/Linux/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationPackageRoot/ApplicationManifest.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationPackageRoot/ApplicationManifest.xml deleted file mode 100644 index bb1cf2743..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationPackageRoot/ApplicationManifest.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationPackageRoot/RabbitMQPkg/Config/Settings.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationPackageRoot/RabbitMQPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationPackageRoot/RabbitMQPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationPackageRoot/RabbitMQPkg/ServiceManifest.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationPackageRoot/RabbitMQPkg/ServiceManifest.xml deleted file mode 100644 index 9415f54f2..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationPackageRoot/RabbitMQPkg/ServiceManifest.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - spring2/rabbitmq:3.6.10 - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationParameters/Cloud.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationParameters/Cloud.xml deleted file mode 100644 index 5a4c2828d..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationParameters/Cloud.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationParameters/Local.1Node.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationParameters/Local.1Node.xml deleted file mode 100644 index 1699b8eaa..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationParameters/Local.1Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationParameters/Local.5Node.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationParameters/Local.5Node.xml deleted file mode 100644 index 1699b8eaa..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/ApplicationParameters/Local.5Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/Bus.sfproj b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/Bus.sfproj deleted file mode 100644 index 0a56c800e..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/Bus.sfproj +++ /dev/null @@ -1,46 +0,0 @@ - - - - - f29e27c9-0d5e-4a57-adbf-dd651649d2a1 - 1.7 - 1.5 - 1.6 - v4.6.1 - - - - Debug - x64 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Service Fabric Tools\Microsoft.VisualStudio.Azure.Fabric.ApplicationProject.targets - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/PublishProfiles/Cloud.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/PublishProfiles/Cloud.xml deleted file mode 100644 index 2ab9df11c..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/PublishProfiles/Cloud.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/PublishProfiles/Local.1Node.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/PublishProfiles/Local.1Node.xml deleted file mode 100644 index 6e1403e96..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/PublishProfiles/Local.1Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/PublishProfiles/Local.5Node.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/PublishProfiles/Local.5Node.xml deleted file mode 100644 index f42d759c3..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/PublishProfiles/Local.5Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/Scripts/Deploy-FabricApplication.ps1 b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/Scripts/Deploy-FabricApplication.ps1 deleted file mode 100644 index 2897b10e8..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/Scripts/Deploy-FabricApplication.ps1 +++ /dev/null @@ -1,258 +0,0 @@ -<# -.SYNOPSIS -Deploys a Service Fabric application type to a cluster. - -.DESCRIPTION -This script deploys a Service Fabric application type to a cluster. It is invoked by Visual Studio when deploying a Service Fabric Application project. - -.NOTES -WARNING: This script file is invoked by Visual Studio. Its parameters must not be altered but its logic can be customized as necessary. - -.PARAMETER PublishProfileFile -Path to the file containing the publish profile. - -.PARAMETER ApplicationPackagePath -Path to the folder of the packaged Service Fabric application. - -.PARAMETER DeployOnly -Indicates that the Service Fabric application should not be created or upgraded after registering the application type. - -.PARAMETER ApplicationParameter -Hashtable of the Service Fabric application parameters to be used for the application. - -.PARAMETER UnregisterUnusedApplicationVersionsAfterUpgrade -Indicates whether to unregister any unused application versions that exist after an upgrade is finished. - -.PARAMETER OverrideUpgradeBehavior -Indicates the behavior used to override the upgrade settings specified by the publish profile. -'None' indicates that the upgrade settings will not be overridden. -'ForceUpgrade' indicates that an upgrade will occur with default settings, regardless of what is specified in the publish profile. -'VetoUpgrade' indicates that an upgrade will not occur, regardless of what is specified in the publish profile. - -.PARAMETER UseExistingClusterConnection -Indicates that the script should make use of an existing cluster connection that has already been established in the PowerShell session. The cluster connection parameters configured in the publish profile are ignored. - -.PARAMETER OverwriteBehavior -Overwrite Behavior if an application exists in the cluster with the same name. Available Options are Never, Always, SameAppTypeAndVersion. This setting is not applicable when upgrading an application. -'Never' will not remove the existing application. This is the default behavior. -'Always' will remove the existing application even if its Application type and Version is different from the application being created. -'SameAppTypeAndVersion' will remove the existing application only if its Application type and Version is same as the application being created. - -.PARAMETER SkipPackageValidation -Switch signaling whether the package should be validated or not before deployment. - -.PARAMETER SecurityToken -A security token for authentication to cluster management endpoints. Used for silent authentication to clusters that are protected by Azure Active Directory. - -.PARAMETER CopyPackageTimeoutSec -Timeout in seconds for copying application package to image store. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' - -Deploy the application using the default package location for a Debug build. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -DoNotCreateApplication - -Deploy the application but do not create the application instance. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -ApplicationParameter @{CustomParameter1='MyValue'; CustomParameter2='MyValue'} - -Deploy the application by providing values for parameters that are defined in the application manifest. -#> - -Param -( - [String] - $PublishProfileFile, - - [String] - $ApplicationPackagePath, - - [Switch] - $DeployOnly, - - [Hashtable] - $ApplicationParameter, - - [Boolean] - $UnregisterUnusedApplicationVersionsAfterUpgrade, - - [String] - [ValidateSet('None', 'ForceUpgrade', 'VetoUpgrade')] - $OverrideUpgradeBehavior = 'None', - - [Switch] - $UseExistingClusterConnection, - - [String] - [ValidateSet('Never','Always','SameAppTypeAndVersion')] - $OverwriteBehavior = 'Never', - - [Switch] - $SkipPackageValidation, - - [String] - $SecurityToken, - - [int] - $CopyPackageTimeoutSec -) - -function Read-XmlElementAsHashtable -{ - Param ( - [System.Xml.XmlElement] - $Element - ) - - $hashtable = @{} - if ($Element.Attributes) - { - $Element.Attributes | - ForEach-Object { - $boolVal = $null - if ([bool]::TryParse($_.Value, [ref]$boolVal)) { - $hashtable[$_.Name] = $boolVal - } - else { - $hashtable[$_.Name] = $_.Value - } - } - } - - return $hashtable -} - -function Read-PublishProfile -{ - Param ( - [ValidateScript({Test-Path $_ -PathType Leaf})] - [String] - $PublishProfileFile - ) - - $publishProfileXml = [Xml] (Get-Content $PublishProfileFile) - $publishProfile = @{} - - $publishProfile.ClusterConnectionParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("ClusterConnectionParameters") - $publishProfile.UpgradeDeployment = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment") - $publishProfile.CopyPackageParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("CopyPackageParameters") - - if ($publishProfileXml.PublishProfile.Item("UpgradeDeployment")) - { - $publishProfile.UpgradeDeployment.Parameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment").Item("Parameters") - if ($publishProfile.UpgradeDeployment["Mode"]) - { - $publishProfile.UpgradeDeployment.Parameters[$publishProfile.UpgradeDeployment["Mode"]] = $true - } - } - - $publishProfileFolder = (Split-Path $PublishProfileFile) - $publishProfile.ApplicationParameterFile = [System.IO.Path]::Combine($PublishProfileFolder, $publishProfileXml.PublishProfile.ApplicationParameterFile.Path) - - return $publishProfile -} - -$LocalFolder = (Split-Path $MyInvocation.MyCommand.Path) - -if (!$PublishProfileFile) -{ - $PublishProfileFile = "$LocalFolder\..\PublishProfiles\Local.xml" -} - -if (!$ApplicationPackagePath) -{ - $ApplicationPackagePath = "$LocalFolder\..\pkg\Release" -} - -$ApplicationPackagePath = Resolve-Path $ApplicationPackagePath - -$publishProfile = Read-PublishProfile $PublishProfileFile - -if (-not $UseExistingClusterConnection) -{ - $ClusterConnectionParameters = $publishProfile.ClusterConnectionParameters - if ($SecurityToken) - { - $ClusterConnectionParameters["SecurityToken"] = $SecurityToken - } - - try - { - [void](Connect-ServiceFabricCluster @ClusterConnectionParameters) - } - catch [System.Fabric.FabricObjectClosedException] - { - Write-Warning "Service Fabric cluster may not be connected." - throw - } -} - -$RegKey = "HKLM:\SOFTWARE\Microsoft\Service Fabric SDK" -$ModuleFolderPath = (Get-ItemProperty -Path $RegKey -Name FabricSDKPSModulePath).FabricSDKPSModulePath -Import-Module "$ModuleFolderPath\ServiceFabricSDK.psm1" - -$IsUpgrade = ($publishProfile.UpgradeDeployment -and $publishProfile.UpgradeDeployment.Enabled -and $OverrideUpgradeBehavior -ne 'VetoUpgrade') -or $OverrideUpgradeBehavior -eq 'ForceUpgrade' - -$PublishParameters = @{ - 'ApplicationPackagePath' = $ApplicationPackagePath - 'ApplicationParameterFilePath' = $publishProfile.ApplicationParameterFile - 'ApplicationParameter' = $ApplicationParameter - 'ErrorAction' = 'Stop' -} - -if ($publishProfile.CopyPackageParameters.CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $publishProfile.CopyPackageParameters.CopyPackageTimeoutSec -} - -if ($publishProfile.CopyPackageParameters.CompressPackage) -{ - $PublishParameters['CompressPackage'] = $publishProfile.CopyPackageParameters.CompressPackage -} - -# CopyPackageTimeoutSec parameter overrides the value from the publish profile -if ($CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $CopyPackageTimeoutSec -} - -if ($IsUpgrade) -{ - $Action = "RegisterAndUpgrade" - if ($DeployOnly) - { - $Action = "Register" - } - - $UpgradeParameters = $publishProfile.UpgradeDeployment.Parameters - - if ($OverrideUpgradeBehavior -eq 'ForceUpgrade') - { - # Warning: Do not alter these upgrade parameters. It will create an inconsistency with Visual Studio's behavior. - $UpgradeParameters = @{ UnmonitoredAuto = $true; Force = $true } - } - - $PublishParameters['Action'] = $Action - $PublishParameters['UpgradeParameters'] = $UpgradeParameters - $PublishParameters['UnregisterUnusedVersions'] = $UnregisterUnusedApplicationVersionsAfterUpgrade - - Publish-UpgradedServiceFabricApplication @PublishParameters -} -else -{ - $Action = "RegisterAndCreate" - if ($DeployOnly) - { - $Action = "Register" - } - - $PublishParameters['Action'] = $Action - $PublishParameters['OverwriteBehavior'] = $OverwriteBehavior - $PublishParameters['SkipPackageValidation'] = $SkipPackageValidation - - Publish-NewServiceFabricApplication @PublishParameters -} \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/packages.config b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/packages.config deleted file mode 100644 index 3dc0a332b..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricBus/Bus/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationPackageRoot/ApplicationManifest.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationPackageRoot/ApplicationManifest.xml deleted file mode 100644 index fe031fe95..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationPackageRoot/ApplicationManifest.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationPackageRoot/MongoDBPkg/Config/Settings.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationPackageRoot/MongoDBPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationPackageRoot/MongoDBPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationPackageRoot/MongoDBPkg/ServiceManifest.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationPackageRoot/MongoDBPkg/ServiceManifest.xml deleted file mode 100644 index be47332ca..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationPackageRoot/MongoDBPkg/ServiceManifest.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - mongo:windowsservercore - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationParameters/Cloud.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationParameters/Cloud.xml deleted file mode 100644 index 8b48c39d1..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationParameters/Cloud.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationParameters/Local.1Node.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationParameters/Local.1Node.xml deleted file mode 100644 index 22363f273..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationParameters/Local.1Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationParameters/Local.5Node.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationParameters/Local.5Node.xml deleted file mode 100644 index 22363f273..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/ApplicationParameters/Local.5Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/NoSQL.sfproj b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/NoSQL.sfproj deleted file mode 100644 index f07ff03a9..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/NoSQL.sfproj +++ /dev/null @@ -1,46 +0,0 @@ - - - - - eb070036-ec60-49a6-88e1-562a2043c3d7 - 1.7 - 1.5 - 1.6 - v4.6.1 - - - - Debug - x64 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Service Fabric Tools\Microsoft.VisualStudio.Azure.Fabric.ApplicationProject.targets - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/PublishProfiles/Cloud.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/PublishProfiles/Cloud.xml deleted file mode 100644 index 2ab9df11c..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/PublishProfiles/Cloud.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/PublishProfiles/Local.1Node.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/PublishProfiles/Local.1Node.xml deleted file mode 100644 index 6e1403e96..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/PublishProfiles/Local.1Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/PublishProfiles/Local.5Node.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/PublishProfiles/Local.5Node.xml deleted file mode 100644 index f42d759c3..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/PublishProfiles/Local.5Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/Scripts/Deploy-FabricApplication.ps1 b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/Scripts/Deploy-FabricApplication.ps1 deleted file mode 100644 index 2897b10e8..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/Scripts/Deploy-FabricApplication.ps1 +++ /dev/null @@ -1,258 +0,0 @@ -<# -.SYNOPSIS -Deploys a Service Fabric application type to a cluster. - -.DESCRIPTION -This script deploys a Service Fabric application type to a cluster. It is invoked by Visual Studio when deploying a Service Fabric Application project. - -.NOTES -WARNING: This script file is invoked by Visual Studio. Its parameters must not be altered but its logic can be customized as necessary. - -.PARAMETER PublishProfileFile -Path to the file containing the publish profile. - -.PARAMETER ApplicationPackagePath -Path to the folder of the packaged Service Fabric application. - -.PARAMETER DeployOnly -Indicates that the Service Fabric application should not be created or upgraded after registering the application type. - -.PARAMETER ApplicationParameter -Hashtable of the Service Fabric application parameters to be used for the application. - -.PARAMETER UnregisterUnusedApplicationVersionsAfterUpgrade -Indicates whether to unregister any unused application versions that exist after an upgrade is finished. - -.PARAMETER OverrideUpgradeBehavior -Indicates the behavior used to override the upgrade settings specified by the publish profile. -'None' indicates that the upgrade settings will not be overridden. -'ForceUpgrade' indicates that an upgrade will occur with default settings, regardless of what is specified in the publish profile. -'VetoUpgrade' indicates that an upgrade will not occur, regardless of what is specified in the publish profile. - -.PARAMETER UseExistingClusterConnection -Indicates that the script should make use of an existing cluster connection that has already been established in the PowerShell session. The cluster connection parameters configured in the publish profile are ignored. - -.PARAMETER OverwriteBehavior -Overwrite Behavior if an application exists in the cluster with the same name. Available Options are Never, Always, SameAppTypeAndVersion. This setting is not applicable when upgrading an application. -'Never' will not remove the existing application. This is the default behavior. -'Always' will remove the existing application even if its Application type and Version is different from the application being created. -'SameAppTypeAndVersion' will remove the existing application only if its Application type and Version is same as the application being created. - -.PARAMETER SkipPackageValidation -Switch signaling whether the package should be validated or not before deployment. - -.PARAMETER SecurityToken -A security token for authentication to cluster management endpoints. Used for silent authentication to clusters that are protected by Azure Active Directory. - -.PARAMETER CopyPackageTimeoutSec -Timeout in seconds for copying application package to image store. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' - -Deploy the application using the default package location for a Debug build. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -DoNotCreateApplication - -Deploy the application but do not create the application instance. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -ApplicationParameter @{CustomParameter1='MyValue'; CustomParameter2='MyValue'} - -Deploy the application by providing values for parameters that are defined in the application manifest. -#> - -Param -( - [String] - $PublishProfileFile, - - [String] - $ApplicationPackagePath, - - [Switch] - $DeployOnly, - - [Hashtable] - $ApplicationParameter, - - [Boolean] - $UnregisterUnusedApplicationVersionsAfterUpgrade, - - [String] - [ValidateSet('None', 'ForceUpgrade', 'VetoUpgrade')] - $OverrideUpgradeBehavior = 'None', - - [Switch] - $UseExistingClusterConnection, - - [String] - [ValidateSet('Never','Always','SameAppTypeAndVersion')] - $OverwriteBehavior = 'Never', - - [Switch] - $SkipPackageValidation, - - [String] - $SecurityToken, - - [int] - $CopyPackageTimeoutSec -) - -function Read-XmlElementAsHashtable -{ - Param ( - [System.Xml.XmlElement] - $Element - ) - - $hashtable = @{} - if ($Element.Attributes) - { - $Element.Attributes | - ForEach-Object { - $boolVal = $null - if ([bool]::TryParse($_.Value, [ref]$boolVal)) { - $hashtable[$_.Name] = $boolVal - } - else { - $hashtable[$_.Name] = $_.Value - } - } - } - - return $hashtable -} - -function Read-PublishProfile -{ - Param ( - [ValidateScript({Test-Path $_ -PathType Leaf})] - [String] - $PublishProfileFile - ) - - $publishProfileXml = [Xml] (Get-Content $PublishProfileFile) - $publishProfile = @{} - - $publishProfile.ClusterConnectionParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("ClusterConnectionParameters") - $publishProfile.UpgradeDeployment = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment") - $publishProfile.CopyPackageParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("CopyPackageParameters") - - if ($publishProfileXml.PublishProfile.Item("UpgradeDeployment")) - { - $publishProfile.UpgradeDeployment.Parameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment").Item("Parameters") - if ($publishProfile.UpgradeDeployment["Mode"]) - { - $publishProfile.UpgradeDeployment.Parameters[$publishProfile.UpgradeDeployment["Mode"]] = $true - } - } - - $publishProfileFolder = (Split-Path $PublishProfileFile) - $publishProfile.ApplicationParameterFile = [System.IO.Path]::Combine($PublishProfileFolder, $publishProfileXml.PublishProfile.ApplicationParameterFile.Path) - - return $publishProfile -} - -$LocalFolder = (Split-Path $MyInvocation.MyCommand.Path) - -if (!$PublishProfileFile) -{ - $PublishProfileFile = "$LocalFolder\..\PublishProfiles\Local.xml" -} - -if (!$ApplicationPackagePath) -{ - $ApplicationPackagePath = "$LocalFolder\..\pkg\Release" -} - -$ApplicationPackagePath = Resolve-Path $ApplicationPackagePath - -$publishProfile = Read-PublishProfile $PublishProfileFile - -if (-not $UseExistingClusterConnection) -{ - $ClusterConnectionParameters = $publishProfile.ClusterConnectionParameters - if ($SecurityToken) - { - $ClusterConnectionParameters["SecurityToken"] = $SecurityToken - } - - try - { - [void](Connect-ServiceFabricCluster @ClusterConnectionParameters) - } - catch [System.Fabric.FabricObjectClosedException] - { - Write-Warning "Service Fabric cluster may not be connected." - throw - } -} - -$RegKey = "HKLM:\SOFTWARE\Microsoft\Service Fabric SDK" -$ModuleFolderPath = (Get-ItemProperty -Path $RegKey -Name FabricSDKPSModulePath).FabricSDKPSModulePath -Import-Module "$ModuleFolderPath\ServiceFabricSDK.psm1" - -$IsUpgrade = ($publishProfile.UpgradeDeployment -and $publishProfile.UpgradeDeployment.Enabled -and $OverrideUpgradeBehavior -ne 'VetoUpgrade') -or $OverrideUpgradeBehavior -eq 'ForceUpgrade' - -$PublishParameters = @{ - 'ApplicationPackagePath' = $ApplicationPackagePath - 'ApplicationParameterFilePath' = $publishProfile.ApplicationParameterFile - 'ApplicationParameter' = $ApplicationParameter - 'ErrorAction' = 'Stop' -} - -if ($publishProfile.CopyPackageParameters.CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $publishProfile.CopyPackageParameters.CopyPackageTimeoutSec -} - -if ($publishProfile.CopyPackageParameters.CompressPackage) -{ - $PublishParameters['CompressPackage'] = $publishProfile.CopyPackageParameters.CompressPackage -} - -# CopyPackageTimeoutSec parameter overrides the value from the publish profile -if ($CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $CopyPackageTimeoutSec -} - -if ($IsUpgrade) -{ - $Action = "RegisterAndUpgrade" - if ($DeployOnly) - { - $Action = "Register" - } - - $UpgradeParameters = $publishProfile.UpgradeDeployment.Parameters - - if ($OverrideUpgradeBehavior -eq 'ForceUpgrade') - { - # Warning: Do not alter these upgrade parameters. It will create an inconsistency with Visual Studio's behavior. - $UpgradeParameters = @{ UnmonitoredAuto = $true; Force = $true } - } - - $PublishParameters['Action'] = $Action - $PublishParameters['UpgradeParameters'] = $UpgradeParameters - $PublishParameters['UnregisterUnusedVersions'] = $UnregisterUnusedApplicationVersionsAfterUpgrade - - Publish-UpgradedServiceFabricApplication @PublishParameters -} -else -{ - $Action = "RegisterAndCreate" - if ($DeployOnly) - { - $Action = "Register" - } - - $PublishParameters['Action'] = $Action - $PublishParameters['OverwriteBehavior'] = $OverwriteBehavior - $PublishParameters['SkipPackageValidation'] = $SkipPackageValidation - - Publish-NewServiceFabricApplication @PublishParameters -} \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/packages.config b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/packages.config deleted file mode 100644 index 3dc0a332b..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricNoSql/NoSQL/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationPackageRoot/ApplicationManifest.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationPackageRoot/ApplicationManifest.xml deleted file mode 100644 index 11bf47a6a..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationPackageRoot/ApplicationManifest.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationPackageRoot/BasketDataPkg/Config/Settings.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationPackageRoot/BasketDataPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationPackageRoot/BasketDataPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationPackageRoot/BasketDataPkg/ServiceManifest.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationPackageRoot/BasketDataPkg/ServiceManifest.xml deleted file mode 100644 index ea9deb355..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationPackageRoot/BasketDataPkg/ServiceManifest.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - redis:nanoserver - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationParameters/Cloud.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationParameters/Cloud.xml deleted file mode 100644 index 951ce24db..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationParameters/Cloud.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationParameters/Local.1Node.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationParameters/Local.1Node.xml deleted file mode 100644 index e2f3876c7..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationParameters/Local.1Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationParameters/Local.5Node.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationParameters/Local.5Node.xml deleted file mode 100644 index e2f3876c7..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/ApplicationParameters/Local.5Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/PublishProfiles/Cloud.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/PublishProfiles/Cloud.xml deleted file mode 100644 index 2ab9df11c..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/PublishProfiles/Cloud.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/PublishProfiles/Local.1Node.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/PublishProfiles/Local.1Node.xml deleted file mode 100644 index 6e1403e96..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/PublishProfiles/Local.1Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/PublishProfiles/Local.5Node.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/PublishProfiles/Local.5Node.xml deleted file mode 100644 index f42d759c3..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/PublishProfiles/Local.5Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/Redis.sfproj b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/Redis.sfproj deleted file mode 100644 index 5b28bfdba..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/Redis.sfproj +++ /dev/null @@ -1,46 +0,0 @@ - - - - - 17acd9ea-8f16-4091-aa29-c67002971eee - 1.7 - 1.5 - 1.6 - v4.6.1 - - - - Debug - x64 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Service Fabric Tools\Microsoft.VisualStudio.Azure.Fabric.ApplicationProject.targets - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/Scripts/Deploy-FabricApplication.ps1 b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/Scripts/Deploy-FabricApplication.ps1 deleted file mode 100644 index 2897b10e8..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/Scripts/Deploy-FabricApplication.ps1 +++ /dev/null @@ -1,258 +0,0 @@ -<# -.SYNOPSIS -Deploys a Service Fabric application type to a cluster. - -.DESCRIPTION -This script deploys a Service Fabric application type to a cluster. It is invoked by Visual Studio when deploying a Service Fabric Application project. - -.NOTES -WARNING: This script file is invoked by Visual Studio. Its parameters must not be altered but its logic can be customized as necessary. - -.PARAMETER PublishProfileFile -Path to the file containing the publish profile. - -.PARAMETER ApplicationPackagePath -Path to the folder of the packaged Service Fabric application. - -.PARAMETER DeployOnly -Indicates that the Service Fabric application should not be created or upgraded after registering the application type. - -.PARAMETER ApplicationParameter -Hashtable of the Service Fabric application parameters to be used for the application. - -.PARAMETER UnregisterUnusedApplicationVersionsAfterUpgrade -Indicates whether to unregister any unused application versions that exist after an upgrade is finished. - -.PARAMETER OverrideUpgradeBehavior -Indicates the behavior used to override the upgrade settings specified by the publish profile. -'None' indicates that the upgrade settings will not be overridden. -'ForceUpgrade' indicates that an upgrade will occur with default settings, regardless of what is specified in the publish profile. -'VetoUpgrade' indicates that an upgrade will not occur, regardless of what is specified in the publish profile. - -.PARAMETER UseExistingClusterConnection -Indicates that the script should make use of an existing cluster connection that has already been established in the PowerShell session. The cluster connection parameters configured in the publish profile are ignored. - -.PARAMETER OverwriteBehavior -Overwrite Behavior if an application exists in the cluster with the same name. Available Options are Never, Always, SameAppTypeAndVersion. This setting is not applicable when upgrading an application. -'Never' will not remove the existing application. This is the default behavior. -'Always' will remove the existing application even if its Application type and Version is different from the application being created. -'SameAppTypeAndVersion' will remove the existing application only if its Application type and Version is same as the application being created. - -.PARAMETER SkipPackageValidation -Switch signaling whether the package should be validated or not before deployment. - -.PARAMETER SecurityToken -A security token for authentication to cluster management endpoints. Used for silent authentication to clusters that are protected by Azure Active Directory. - -.PARAMETER CopyPackageTimeoutSec -Timeout in seconds for copying application package to image store. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' - -Deploy the application using the default package location for a Debug build. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -DoNotCreateApplication - -Deploy the application but do not create the application instance. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -ApplicationParameter @{CustomParameter1='MyValue'; CustomParameter2='MyValue'} - -Deploy the application by providing values for parameters that are defined in the application manifest. -#> - -Param -( - [String] - $PublishProfileFile, - - [String] - $ApplicationPackagePath, - - [Switch] - $DeployOnly, - - [Hashtable] - $ApplicationParameter, - - [Boolean] - $UnregisterUnusedApplicationVersionsAfterUpgrade, - - [String] - [ValidateSet('None', 'ForceUpgrade', 'VetoUpgrade')] - $OverrideUpgradeBehavior = 'None', - - [Switch] - $UseExistingClusterConnection, - - [String] - [ValidateSet('Never','Always','SameAppTypeAndVersion')] - $OverwriteBehavior = 'Never', - - [Switch] - $SkipPackageValidation, - - [String] - $SecurityToken, - - [int] - $CopyPackageTimeoutSec -) - -function Read-XmlElementAsHashtable -{ - Param ( - [System.Xml.XmlElement] - $Element - ) - - $hashtable = @{} - if ($Element.Attributes) - { - $Element.Attributes | - ForEach-Object { - $boolVal = $null - if ([bool]::TryParse($_.Value, [ref]$boolVal)) { - $hashtable[$_.Name] = $boolVal - } - else { - $hashtable[$_.Name] = $_.Value - } - } - } - - return $hashtable -} - -function Read-PublishProfile -{ - Param ( - [ValidateScript({Test-Path $_ -PathType Leaf})] - [String] - $PublishProfileFile - ) - - $publishProfileXml = [Xml] (Get-Content $PublishProfileFile) - $publishProfile = @{} - - $publishProfile.ClusterConnectionParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("ClusterConnectionParameters") - $publishProfile.UpgradeDeployment = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment") - $publishProfile.CopyPackageParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("CopyPackageParameters") - - if ($publishProfileXml.PublishProfile.Item("UpgradeDeployment")) - { - $publishProfile.UpgradeDeployment.Parameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment").Item("Parameters") - if ($publishProfile.UpgradeDeployment["Mode"]) - { - $publishProfile.UpgradeDeployment.Parameters[$publishProfile.UpgradeDeployment["Mode"]] = $true - } - } - - $publishProfileFolder = (Split-Path $PublishProfileFile) - $publishProfile.ApplicationParameterFile = [System.IO.Path]::Combine($PublishProfileFolder, $publishProfileXml.PublishProfile.ApplicationParameterFile.Path) - - return $publishProfile -} - -$LocalFolder = (Split-Path $MyInvocation.MyCommand.Path) - -if (!$PublishProfileFile) -{ - $PublishProfileFile = "$LocalFolder\..\PublishProfiles\Local.xml" -} - -if (!$ApplicationPackagePath) -{ - $ApplicationPackagePath = "$LocalFolder\..\pkg\Release" -} - -$ApplicationPackagePath = Resolve-Path $ApplicationPackagePath - -$publishProfile = Read-PublishProfile $PublishProfileFile - -if (-not $UseExistingClusterConnection) -{ - $ClusterConnectionParameters = $publishProfile.ClusterConnectionParameters - if ($SecurityToken) - { - $ClusterConnectionParameters["SecurityToken"] = $SecurityToken - } - - try - { - [void](Connect-ServiceFabricCluster @ClusterConnectionParameters) - } - catch [System.Fabric.FabricObjectClosedException] - { - Write-Warning "Service Fabric cluster may not be connected." - throw - } -} - -$RegKey = "HKLM:\SOFTWARE\Microsoft\Service Fabric SDK" -$ModuleFolderPath = (Get-ItemProperty -Path $RegKey -Name FabricSDKPSModulePath).FabricSDKPSModulePath -Import-Module "$ModuleFolderPath\ServiceFabricSDK.psm1" - -$IsUpgrade = ($publishProfile.UpgradeDeployment -and $publishProfile.UpgradeDeployment.Enabled -and $OverrideUpgradeBehavior -ne 'VetoUpgrade') -or $OverrideUpgradeBehavior -eq 'ForceUpgrade' - -$PublishParameters = @{ - 'ApplicationPackagePath' = $ApplicationPackagePath - 'ApplicationParameterFilePath' = $publishProfile.ApplicationParameterFile - 'ApplicationParameter' = $ApplicationParameter - 'ErrorAction' = 'Stop' -} - -if ($publishProfile.CopyPackageParameters.CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $publishProfile.CopyPackageParameters.CopyPackageTimeoutSec -} - -if ($publishProfile.CopyPackageParameters.CompressPackage) -{ - $PublishParameters['CompressPackage'] = $publishProfile.CopyPackageParameters.CompressPackage -} - -# CopyPackageTimeoutSec parameter overrides the value from the publish profile -if ($CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $CopyPackageTimeoutSec -} - -if ($IsUpgrade) -{ - $Action = "RegisterAndUpgrade" - if ($DeployOnly) - { - $Action = "Register" - } - - $UpgradeParameters = $publishProfile.UpgradeDeployment.Parameters - - if ($OverrideUpgradeBehavior -eq 'ForceUpgrade') - { - # Warning: Do not alter these upgrade parameters. It will create an inconsistency with Visual Studio's behavior. - $UpgradeParameters = @{ UnmonitoredAuto = $true; Force = $true } - } - - $PublishParameters['Action'] = $Action - $PublishParameters['UpgradeParameters'] = $UpgradeParameters - $PublishParameters['UnregisterUnusedVersions'] = $UnregisterUnusedApplicationVersionsAfterUpgrade - - Publish-UpgradedServiceFabricApplication @PublishParameters -} -else -{ - $Action = "RegisterAndCreate" - if ($DeployOnly) - { - $Action = "Register" - } - - $PublishParameters['Action'] = $Action - $PublishParameters['OverwriteBehavior'] = $OverwriteBehavior - $PublishParameters['SkipPackageValidation'] = $SkipPackageValidation - - Publish-NewServiceFabricApplication @PublishParameters -} \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/packages.config b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/packages.config deleted file mode 100644 index 3dc0a332b..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricRedis/Redis/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationPackageRoot/ApplicationManifest.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationPackageRoot/ApplicationManifest.xml deleted file mode 100644 index 27fa4bfe2..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationPackageRoot/ApplicationManifest.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationPackageRoot/SqlServerPkg/Config/Settings.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationPackageRoot/SqlServerPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationPackageRoot/SqlServerPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationPackageRoot/SqlServerPkg/ServiceManifest.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationPackageRoot/SqlServerPkg/ServiceManifest.xml deleted file mode 100644 index 252c74f21..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationPackageRoot/SqlServerPkg/ServiceManifest.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - microsoft/mssql-server-windows-developer:2017 - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationParameters/Cloud.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationParameters/Cloud.xml deleted file mode 100644 index 3ad12232a..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationParameters/Cloud.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationParameters/Local.1Node.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationParameters/Local.1Node.xml deleted file mode 100644 index 9fc10b0bc..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationParameters/Local.1Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationParameters/Local.5Node.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationParameters/Local.5Node.xml deleted file mode 100644 index 9fc10b0bc..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/ApplicationParameters/Local.5Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/PublishProfiles/Cloud.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/PublishProfiles/Cloud.xml deleted file mode 100644 index 2ab9df11c..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/PublishProfiles/Cloud.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/PublishProfiles/Local.1Node.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/PublishProfiles/Local.1Node.xml deleted file mode 100644 index 6e1403e96..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/PublishProfiles/Local.1Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/PublishProfiles/Local.5Node.xml b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/PublishProfiles/Local.5Node.xml deleted file mode 100644 index f42d759c3..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/PublishProfiles/Local.5Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/Scripts/Deploy-FabricApplication.ps1 b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/Scripts/Deploy-FabricApplication.ps1 deleted file mode 100644 index 2897b10e8..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/Scripts/Deploy-FabricApplication.ps1 +++ /dev/null @@ -1,258 +0,0 @@ -<# -.SYNOPSIS -Deploys a Service Fabric application type to a cluster. - -.DESCRIPTION -This script deploys a Service Fabric application type to a cluster. It is invoked by Visual Studio when deploying a Service Fabric Application project. - -.NOTES -WARNING: This script file is invoked by Visual Studio. Its parameters must not be altered but its logic can be customized as necessary. - -.PARAMETER PublishProfileFile -Path to the file containing the publish profile. - -.PARAMETER ApplicationPackagePath -Path to the folder of the packaged Service Fabric application. - -.PARAMETER DeployOnly -Indicates that the Service Fabric application should not be created or upgraded after registering the application type. - -.PARAMETER ApplicationParameter -Hashtable of the Service Fabric application parameters to be used for the application. - -.PARAMETER UnregisterUnusedApplicationVersionsAfterUpgrade -Indicates whether to unregister any unused application versions that exist after an upgrade is finished. - -.PARAMETER OverrideUpgradeBehavior -Indicates the behavior used to override the upgrade settings specified by the publish profile. -'None' indicates that the upgrade settings will not be overridden. -'ForceUpgrade' indicates that an upgrade will occur with default settings, regardless of what is specified in the publish profile. -'VetoUpgrade' indicates that an upgrade will not occur, regardless of what is specified in the publish profile. - -.PARAMETER UseExistingClusterConnection -Indicates that the script should make use of an existing cluster connection that has already been established in the PowerShell session. The cluster connection parameters configured in the publish profile are ignored. - -.PARAMETER OverwriteBehavior -Overwrite Behavior if an application exists in the cluster with the same name. Available Options are Never, Always, SameAppTypeAndVersion. This setting is not applicable when upgrading an application. -'Never' will not remove the existing application. This is the default behavior. -'Always' will remove the existing application even if its Application type and Version is different from the application being created. -'SameAppTypeAndVersion' will remove the existing application only if its Application type and Version is same as the application being created. - -.PARAMETER SkipPackageValidation -Switch signaling whether the package should be validated or not before deployment. - -.PARAMETER SecurityToken -A security token for authentication to cluster management endpoints. Used for silent authentication to clusters that are protected by Azure Active Directory. - -.PARAMETER CopyPackageTimeoutSec -Timeout in seconds for copying application package to image store. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' - -Deploy the application using the default package location for a Debug build. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -DoNotCreateApplication - -Deploy the application but do not create the application instance. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -ApplicationParameter @{CustomParameter1='MyValue'; CustomParameter2='MyValue'} - -Deploy the application by providing values for parameters that are defined in the application manifest. -#> - -Param -( - [String] - $PublishProfileFile, - - [String] - $ApplicationPackagePath, - - [Switch] - $DeployOnly, - - [Hashtable] - $ApplicationParameter, - - [Boolean] - $UnregisterUnusedApplicationVersionsAfterUpgrade, - - [String] - [ValidateSet('None', 'ForceUpgrade', 'VetoUpgrade')] - $OverrideUpgradeBehavior = 'None', - - [Switch] - $UseExistingClusterConnection, - - [String] - [ValidateSet('Never','Always','SameAppTypeAndVersion')] - $OverwriteBehavior = 'Never', - - [Switch] - $SkipPackageValidation, - - [String] - $SecurityToken, - - [int] - $CopyPackageTimeoutSec -) - -function Read-XmlElementAsHashtable -{ - Param ( - [System.Xml.XmlElement] - $Element - ) - - $hashtable = @{} - if ($Element.Attributes) - { - $Element.Attributes | - ForEach-Object { - $boolVal = $null - if ([bool]::TryParse($_.Value, [ref]$boolVal)) { - $hashtable[$_.Name] = $boolVal - } - else { - $hashtable[$_.Name] = $_.Value - } - } - } - - return $hashtable -} - -function Read-PublishProfile -{ - Param ( - [ValidateScript({Test-Path $_ -PathType Leaf})] - [String] - $PublishProfileFile - ) - - $publishProfileXml = [Xml] (Get-Content $PublishProfileFile) - $publishProfile = @{} - - $publishProfile.ClusterConnectionParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("ClusterConnectionParameters") - $publishProfile.UpgradeDeployment = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment") - $publishProfile.CopyPackageParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("CopyPackageParameters") - - if ($publishProfileXml.PublishProfile.Item("UpgradeDeployment")) - { - $publishProfile.UpgradeDeployment.Parameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment").Item("Parameters") - if ($publishProfile.UpgradeDeployment["Mode"]) - { - $publishProfile.UpgradeDeployment.Parameters[$publishProfile.UpgradeDeployment["Mode"]] = $true - } - } - - $publishProfileFolder = (Split-Path $PublishProfileFile) - $publishProfile.ApplicationParameterFile = [System.IO.Path]::Combine($PublishProfileFolder, $publishProfileXml.PublishProfile.ApplicationParameterFile.Path) - - return $publishProfile -} - -$LocalFolder = (Split-Path $MyInvocation.MyCommand.Path) - -if (!$PublishProfileFile) -{ - $PublishProfileFile = "$LocalFolder\..\PublishProfiles\Local.xml" -} - -if (!$ApplicationPackagePath) -{ - $ApplicationPackagePath = "$LocalFolder\..\pkg\Release" -} - -$ApplicationPackagePath = Resolve-Path $ApplicationPackagePath - -$publishProfile = Read-PublishProfile $PublishProfileFile - -if (-not $UseExistingClusterConnection) -{ - $ClusterConnectionParameters = $publishProfile.ClusterConnectionParameters - if ($SecurityToken) - { - $ClusterConnectionParameters["SecurityToken"] = $SecurityToken - } - - try - { - [void](Connect-ServiceFabricCluster @ClusterConnectionParameters) - } - catch [System.Fabric.FabricObjectClosedException] - { - Write-Warning "Service Fabric cluster may not be connected." - throw - } -} - -$RegKey = "HKLM:\SOFTWARE\Microsoft\Service Fabric SDK" -$ModuleFolderPath = (Get-ItemProperty -Path $RegKey -Name FabricSDKPSModulePath).FabricSDKPSModulePath -Import-Module "$ModuleFolderPath\ServiceFabricSDK.psm1" - -$IsUpgrade = ($publishProfile.UpgradeDeployment -and $publishProfile.UpgradeDeployment.Enabled -and $OverrideUpgradeBehavior -ne 'VetoUpgrade') -or $OverrideUpgradeBehavior -eq 'ForceUpgrade' - -$PublishParameters = @{ - 'ApplicationPackagePath' = $ApplicationPackagePath - 'ApplicationParameterFilePath' = $publishProfile.ApplicationParameterFile - 'ApplicationParameter' = $ApplicationParameter - 'ErrorAction' = 'Stop' -} - -if ($publishProfile.CopyPackageParameters.CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $publishProfile.CopyPackageParameters.CopyPackageTimeoutSec -} - -if ($publishProfile.CopyPackageParameters.CompressPackage) -{ - $PublishParameters['CompressPackage'] = $publishProfile.CopyPackageParameters.CompressPackage -} - -# CopyPackageTimeoutSec parameter overrides the value from the publish profile -if ($CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $CopyPackageTimeoutSec -} - -if ($IsUpgrade) -{ - $Action = "RegisterAndUpgrade" - if ($DeployOnly) - { - $Action = "Register" - } - - $UpgradeParameters = $publishProfile.UpgradeDeployment.Parameters - - if ($OverrideUpgradeBehavior -eq 'ForceUpgrade') - { - # Warning: Do not alter these upgrade parameters. It will create an inconsistency with Visual Studio's behavior. - $UpgradeParameters = @{ UnmonitoredAuto = $true; Force = $true } - } - - $PublishParameters['Action'] = $Action - $PublishParameters['UpgradeParameters'] = $UpgradeParameters - $PublishParameters['UnregisterUnusedVersions'] = $UnregisterUnusedApplicationVersionsAfterUpgrade - - Publish-UpgradedServiceFabricApplication @PublishParameters -} -else -{ - $Action = "RegisterAndCreate" - if ($DeployOnly) - { - $Action = "Register" - } - - $PublishParameters['Action'] = $Action - $PublishParameters['OverwriteBehavior'] = $OverwriteBehavior - $PublishParameters['SkipPackageValidation'] = $SkipPackageValidation - - Publish-NewServiceFabricApplication @PublishParameters -} \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/Sql.sfproj b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/Sql.sfproj deleted file mode 100644 index 48447811e..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/Sql.sfproj +++ /dev/null @@ -1,46 +0,0 @@ - - - - - 65a83188-79c1-47ad-931d-8e8a87247408 - 1.7 - 1.5 - 1.6 - v4.6.1 - - - - Debug - x64 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Service Fabric Tools\Microsoft.VisualStudio.Azure.Fabric.ApplicationProject.targets - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/packages.config b/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/packages.config deleted file mode 100644 index 3dc0a332b..000000000 --- a/ServiceFabric/Windows/Infrastructure/eShopOnServiceFabricSql/Sql/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/ApplicationManifest.xml b/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/ApplicationManifest.xml deleted file mode 100644 index 05704ada8..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/ApplicationManifest.xml +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/BasketApiPkg/Config/Settings.xml b/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/BasketApiPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/BasketApiPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/BasketApiPkg/ServiceManifest.xml b/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/BasketApiPkg/ServiceManifest.xml deleted file mode 100644 index d45768eba..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/BasketApiPkg/ServiceManifest.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - eshop/basket.api-win:#{tag}# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/CatalogApiPkg/Config/Settings.xml b/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/CatalogApiPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/CatalogApiPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/CatalogApiPkg/ServiceManifest.xml b/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/CatalogApiPkg/ServiceManifest.xml deleted file mode 100644 index 5c14568eb..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/CatalogApiPkg/ServiceManifest.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - eshop/catalog.api-win:#{tag}# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/LocationsApiPkg/Config/Settings.xml b/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/LocationsApiPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/LocationsApiPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/LocationsApiPkg/ServiceManifest.xml b/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/LocationsApiPkg/ServiceManifest.xml deleted file mode 100644 index 36a817d36..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/LocationsApiPkg/ServiceManifest.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - eshop/locations.api-win:#{tag}# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/MarketingApiPkg/Config/Settings.xml b/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/MarketingApiPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/MarketingApiPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/MarketingApiPkg/ServiceManifest.xml b/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/MarketingApiPkg/ServiceManifest.xml deleted file mode 100644 index 2fa855974..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/MarketingApiPkg/ServiceManifest.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - eshop/marketing.api-win:#{tag}# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/OrderingApiPkg/Config/Settings.xml b/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/OrderingApiPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/OrderingApiPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/OrderingApiPkg/ServiceManifest.xml b/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/OrderingApiPkg/ServiceManifest.xml deleted file mode 100644 index 2e7aae7a5..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/OrderingApiPkg/ServiceManifest.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - eshop/ordering.api-win:#{tag}# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/OrderingBackgroundPkg/Config/Settings.xml b/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/OrderingBackgroundPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/OrderingBackgroundPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/OrderingBackgroundPkg/ServiceManifest.xml b/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/OrderingBackgroundPkg/ServiceManifest.xml deleted file mode 100644 index c963ce512..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/OrderingBackgroundPkg/ServiceManifest.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - - - eshop/ordering.backgroundtasks-win - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/PaymentApiPkg/Config/Settings.xml b/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/PaymentApiPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/PaymentApiPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/PaymentApiPkg/ServiceManifest.xml b/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/PaymentApiPkg/ServiceManifest.xml deleted file mode 100644 index 5d46ef47c..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationPackageRoot/PaymentApiPkg/ServiceManifest.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - eshop/payment.api-win:#{tag}# - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationParameters/Cloud.xml b/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationParameters/Cloud.xml deleted file mode 100644 index 48b8b6b33..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationParameters/Cloud.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationParameters/Local.1Node.xml b/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationParameters/Local.1Node.xml deleted file mode 100644 index e579cbf89..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationParameters/Local.1Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationParameters/Local.5Node.xml b/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationParameters/Local.5Node.xml deleted file mode 100644 index e579cbf89..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabric/ApplicationParameters/Local.5Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabric/PublishProfiles/Cloud.xml b/ServiceFabric/Windows/eShopOnServiceFabric/PublishProfiles/Cloud.xml deleted file mode 100644 index 2ab9df11c..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabric/PublishProfiles/Cloud.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabric/PublishProfiles/Local.1Node.xml b/ServiceFabric/Windows/eShopOnServiceFabric/PublishProfiles/Local.1Node.xml deleted file mode 100644 index 6e1403e96..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabric/PublishProfiles/Local.1Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabric/PublishProfiles/Local.5Node.xml b/ServiceFabric/Windows/eShopOnServiceFabric/PublishProfiles/Local.5Node.xml deleted file mode 100644 index f42d759c3..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabric/PublishProfiles/Local.5Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabric/Scripts/Deploy-FabricApplication.ps1 b/ServiceFabric/Windows/eShopOnServiceFabric/Scripts/Deploy-FabricApplication.ps1 deleted file mode 100644 index 2897b10e8..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabric/Scripts/Deploy-FabricApplication.ps1 +++ /dev/null @@ -1,258 +0,0 @@ -<# -.SYNOPSIS -Deploys a Service Fabric application type to a cluster. - -.DESCRIPTION -This script deploys a Service Fabric application type to a cluster. It is invoked by Visual Studio when deploying a Service Fabric Application project. - -.NOTES -WARNING: This script file is invoked by Visual Studio. Its parameters must not be altered but its logic can be customized as necessary. - -.PARAMETER PublishProfileFile -Path to the file containing the publish profile. - -.PARAMETER ApplicationPackagePath -Path to the folder of the packaged Service Fabric application. - -.PARAMETER DeployOnly -Indicates that the Service Fabric application should not be created or upgraded after registering the application type. - -.PARAMETER ApplicationParameter -Hashtable of the Service Fabric application parameters to be used for the application. - -.PARAMETER UnregisterUnusedApplicationVersionsAfterUpgrade -Indicates whether to unregister any unused application versions that exist after an upgrade is finished. - -.PARAMETER OverrideUpgradeBehavior -Indicates the behavior used to override the upgrade settings specified by the publish profile. -'None' indicates that the upgrade settings will not be overridden. -'ForceUpgrade' indicates that an upgrade will occur with default settings, regardless of what is specified in the publish profile. -'VetoUpgrade' indicates that an upgrade will not occur, regardless of what is specified in the publish profile. - -.PARAMETER UseExistingClusterConnection -Indicates that the script should make use of an existing cluster connection that has already been established in the PowerShell session. The cluster connection parameters configured in the publish profile are ignored. - -.PARAMETER OverwriteBehavior -Overwrite Behavior if an application exists in the cluster with the same name. Available Options are Never, Always, SameAppTypeAndVersion. This setting is not applicable when upgrading an application. -'Never' will not remove the existing application. This is the default behavior. -'Always' will remove the existing application even if its Application type and Version is different from the application being created. -'SameAppTypeAndVersion' will remove the existing application only if its Application type and Version is same as the application being created. - -.PARAMETER SkipPackageValidation -Switch signaling whether the package should be validated or not before deployment. - -.PARAMETER SecurityToken -A security token for authentication to cluster management endpoints. Used for silent authentication to clusters that are protected by Azure Active Directory. - -.PARAMETER CopyPackageTimeoutSec -Timeout in seconds for copying application package to image store. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' - -Deploy the application using the default package location for a Debug build. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -DoNotCreateApplication - -Deploy the application but do not create the application instance. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -ApplicationParameter @{CustomParameter1='MyValue'; CustomParameter2='MyValue'} - -Deploy the application by providing values for parameters that are defined in the application manifest. -#> - -Param -( - [String] - $PublishProfileFile, - - [String] - $ApplicationPackagePath, - - [Switch] - $DeployOnly, - - [Hashtable] - $ApplicationParameter, - - [Boolean] - $UnregisterUnusedApplicationVersionsAfterUpgrade, - - [String] - [ValidateSet('None', 'ForceUpgrade', 'VetoUpgrade')] - $OverrideUpgradeBehavior = 'None', - - [Switch] - $UseExistingClusterConnection, - - [String] - [ValidateSet('Never','Always','SameAppTypeAndVersion')] - $OverwriteBehavior = 'Never', - - [Switch] - $SkipPackageValidation, - - [String] - $SecurityToken, - - [int] - $CopyPackageTimeoutSec -) - -function Read-XmlElementAsHashtable -{ - Param ( - [System.Xml.XmlElement] - $Element - ) - - $hashtable = @{} - if ($Element.Attributes) - { - $Element.Attributes | - ForEach-Object { - $boolVal = $null - if ([bool]::TryParse($_.Value, [ref]$boolVal)) { - $hashtable[$_.Name] = $boolVal - } - else { - $hashtable[$_.Name] = $_.Value - } - } - } - - return $hashtable -} - -function Read-PublishProfile -{ - Param ( - [ValidateScript({Test-Path $_ -PathType Leaf})] - [String] - $PublishProfileFile - ) - - $publishProfileXml = [Xml] (Get-Content $PublishProfileFile) - $publishProfile = @{} - - $publishProfile.ClusterConnectionParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("ClusterConnectionParameters") - $publishProfile.UpgradeDeployment = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment") - $publishProfile.CopyPackageParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("CopyPackageParameters") - - if ($publishProfileXml.PublishProfile.Item("UpgradeDeployment")) - { - $publishProfile.UpgradeDeployment.Parameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment").Item("Parameters") - if ($publishProfile.UpgradeDeployment["Mode"]) - { - $publishProfile.UpgradeDeployment.Parameters[$publishProfile.UpgradeDeployment["Mode"]] = $true - } - } - - $publishProfileFolder = (Split-Path $PublishProfileFile) - $publishProfile.ApplicationParameterFile = [System.IO.Path]::Combine($PublishProfileFolder, $publishProfileXml.PublishProfile.ApplicationParameterFile.Path) - - return $publishProfile -} - -$LocalFolder = (Split-Path $MyInvocation.MyCommand.Path) - -if (!$PublishProfileFile) -{ - $PublishProfileFile = "$LocalFolder\..\PublishProfiles\Local.xml" -} - -if (!$ApplicationPackagePath) -{ - $ApplicationPackagePath = "$LocalFolder\..\pkg\Release" -} - -$ApplicationPackagePath = Resolve-Path $ApplicationPackagePath - -$publishProfile = Read-PublishProfile $PublishProfileFile - -if (-not $UseExistingClusterConnection) -{ - $ClusterConnectionParameters = $publishProfile.ClusterConnectionParameters - if ($SecurityToken) - { - $ClusterConnectionParameters["SecurityToken"] = $SecurityToken - } - - try - { - [void](Connect-ServiceFabricCluster @ClusterConnectionParameters) - } - catch [System.Fabric.FabricObjectClosedException] - { - Write-Warning "Service Fabric cluster may not be connected." - throw - } -} - -$RegKey = "HKLM:\SOFTWARE\Microsoft\Service Fabric SDK" -$ModuleFolderPath = (Get-ItemProperty -Path $RegKey -Name FabricSDKPSModulePath).FabricSDKPSModulePath -Import-Module "$ModuleFolderPath\ServiceFabricSDK.psm1" - -$IsUpgrade = ($publishProfile.UpgradeDeployment -and $publishProfile.UpgradeDeployment.Enabled -and $OverrideUpgradeBehavior -ne 'VetoUpgrade') -or $OverrideUpgradeBehavior -eq 'ForceUpgrade' - -$PublishParameters = @{ - 'ApplicationPackagePath' = $ApplicationPackagePath - 'ApplicationParameterFilePath' = $publishProfile.ApplicationParameterFile - 'ApplicationParameter' = $ApplicationParameter - 'ErrorAction' = 'Stop' -} - -if ($publishProfile.CopyPackageParameters.CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $publishProfile.CopyPackageParameters.CopyPackageTimeoutSec -} - -if ($publishProfile.CopyPackageParameters.CompressPackage) -{ - $PublishParameters['CompressPackage'] = $publishProfile.CopyPackageParameters.CompressPackage -} - -# CopyPackageTimeoutSec parameter overrides the value from the publish profile -if ($CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $CopyPackageTimeoutSec -} - -if ($IsUpgrade) -{ - $Action = "RegisterAndUpgrade" - if ($DeployOnly) - { - $Action = "Register" - } - - $UpgradeParameters = $publishProfile.UpgradeDeployment.Parameters - - if ($OverrideUpgradeBehavior -eq 'ForceUpgrade') - { - # Warning: Do not alter these upgrade parameters. It will create an inconsistency with Visual Studio's behavior. - $UpgradeParameters = @{ UnmonitoredAuto = $true; Force = $true } - } - - $PublishParameters['Action'] = $Action - $PublishParameters['UpgradeParameters'] = $UpgradeParameters - $PublishParameters['UnregisterUnusedVersions'] = $UnregisterUnusedApplicationVersionsAfterUpgrade - - Publish-UpgradedServiceFabricApplication @PublishParameters -} -else -{ - $Action = "RegisterAndCreate" - if ($DeployOnly) - { - $Action = "Register" - } - - $PublishParameters['Action'] = $Action - $PublishParameters['OverwriteBehavior'] = $OverwriteBehavior - $PublishParameters['SkipPackageValidation'] = $SkipPackageValidation - - Publish-NewServiceFabricApplication @PublishParameters -} \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabric/eShopOnServiceFabric.sfproj b/ServiceFabric/Windows/eShopOnServiceFabric/eShopOnServiceFabric.sfproj deleted file mode 100644 index e345590fb..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabric/eShopOnServiceFabric.sfproj +++ /dev/null @@ -1,57 +0,0 @@ - - - - - 983eab84-65c5-4793-a300-08f97c791a15 - 1.6 - 1.5 - - - - Debug - x64 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Service Fabric Tools\Microsoft.VisualStudio.Azure.Fabric.ApplicationProject.targets - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabric/packages.config b/ServiceFabric/Windows/eShopOnServiceFabric/packages.config deleted file mode 100644 index c5f59e48e..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabric/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationPackageRoot/ApplicationManifest.xml b/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationPackageRoot/ApplicationManifest.xml deleted file mode 100644 index b39aef66a..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationPackageRoot/ApplicationManifest.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationPackageRoot/IdentityApiPkg/Config/Settings.xml b/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationPackageRoot/IdentityApiPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationPackageRoot/IdentityApiPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationPackageRoot/IdentityApiPkg/ServiceManifest.xml b/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationPackageRoot/IdentityApiPkg/ServiceManifest.xml deleted file mode 100644 index 9650b783e..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationPackageRoot/IdentityApiPkg/ServiceManifest.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - eshop/identity.api-win:#{tag}# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationParameters/Cloud.xml b/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationParameters/Cloud.xml deleted file mode 100644 index 207735106..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationParameters/Cloud.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationParameters/Local.1Node.xml b/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationParameters/Local.1Node.xml deleted file mode 100644 index e8623180a..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationParameters/Local.1Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationParameters/Local.5Node.xml b/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationParameters/Local.5Node.xml deleted file mode 100644 index e8623180a..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/ApplicationParameters/Local.5Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Cloud.xml b/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Cloud.xml deleted file mode 100644 index 2ab9df11c..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Cloud.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Local.1Node.xml b/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Local.1Node.xml deleted file mode 100644 index 6e1403e96..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Local.1Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Local.5Node.xml b/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Local.5Node.xml deleted file mode 100644 index f42d759c3..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/PublishProfiles/Local.5Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/Scripts/Deploy-FabricApplication.ps1 b/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/Scripts/Deploy-FabricApplication.ps1 deleted file mode 100644 index 2897b10e8..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/Scripts/Deploy-FabricApplication.ps1 +++ /dev/null @@ -1,258 +0,0 @@ -<# -.SYNOPSIS -Deploys a Service Fabric application type to a cluster. - -.DESCRIPTION -This script deploys a Service Fabric application type to a cluster. It is invoked by Visual Studio when deploying a Service Fabric Application project. - -.NOTES -WARNING: This script file is invoked by Visual Studio. Its parameters must not be altered but its logic can be customized as necessary. - -.PARAMETER PublishProfileFile -Path to the file containing the publish profile. - -.PARAMETER ApplicationPackagePath -Path to the folder of the packaged Service Fabric application. - -.PARAMETER DeployOnly -Indicates that the Service Fabric application should not be created or upgraded after registering the application type. - -.PARAMETER ApplicationParameter -Hashtable of the Service Fabric application parameters to be used for the application. - -.PARAMETER UnregisterUnusedApplicationVersionsAfterUpgrade -Indicates whether to unregister any unused application versions that exist after an upgrade is finished. - -.PARAMETER OverrideUpgradeBehavior -Indicates the behavior used to override the upgrade settings specified by the publish profile. -'None' indicates that the upgrade settings will not be overridden. -'ForceUpgrade' indicates that an upgrade will occur with default settings, regardless of what is specified in the publish profile. -'VetoUpgrade' indicates that an upgrade will not occur, regardless of what is specified in the publish profile. - -.PARAMETER UseExistingClusterConnection -Indicates that the script should make use of an existing cluster connection that has already been established in the PowerShell session. The cluster connection parameters configured in the publish profile are ignored. - -.PARAMETER OverwriteBehavior -Overwrite Behavior if an application exists in the cluster with the same name. Available Options are Never, Always, SameAppTypeAndVersion. This setting is not applicable when upgrading an application. -'Never' will not remove the existing application. This is the default behavior. -'Always' will remove the existing application even if its Application type and Version is different from the application being created. -'SameAppTypeAndVersion' will remove the existing application only if its Application type and Version is same as the application being created. - -.PARAMETER SkipPackageValidation -Switch signaling whether the package should be validated or not before deployment. - -.PARAMETER SecurityToken -A security token for authentication to cluster management endpoints. Used for silent authentication to clusters that are protected by Azure Active Directory. - -.PARAMETER CopyPackageTimeoutSec -Timeout in seconds for copying application package to image store. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' - -Deploy the application using the default package location for a Debug build. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -DoNotCreateApplication - -Deploy the application but do not create the application instance. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -ApplicationParameter @{CustomParameter1='MyValue'; CustomParameter2='MyValue'} - -Deploy the application by providing values for parameters that are defined in the application manifest. -#> - -Param -( - [String] - $PublishProfileFile, - - [String] - $ApplicationPackagePath, - - [Switch] - $DeployOnly, - - [Hashtable] - $ApplicationParameter, - - [Boolean] - $UnregisterUnusedApplicationVersionsAfterUpgrade, - - [String] - [ValidateSet('None', 'ForceUpgrade', 'VetoUpgrade')] - $OverrideUpgradeBehavior = 'None', - - [Switch] - $UseExistingClusterConnection, - - [String] - [ValidateSet('Never','Always','SameAppTypeAndVersion')] - $OverwriteBehavior = 'Never', - - [Switch] - $SkipPackageValidation, - - [String] - $SecurityToken, - - [int] - $CopyPackageTimeoutSec -) - -function Read-XmlElementAsHashtable -{ - Param ( - [System.Xml.XmlElement] - $Element - ) - - $hashtable = @{} - if ($Element.Attributes) - { - $Element.Attributes | - ForEach-Object { - $boolVal = $null - if ([bool]::TryParse($_.Value, [ref]$boolVal)) { - $hashtable[$_.Name] = $boolVal - } - else { - $hashtable[$_.Name] = $_.Value - } - } - } - - return $hashtable -} - -function Read-PublishProfile -{ - Param ( - [ValidateScript({Test-Path $_ -PathType Leaf})] - [String] - $PublishProfileFile - ) - - $publishProfileXml = [Xml] (Get-Content $PublishProfileFile) - $publishProfile = @{} - - $publishProfile.ClusterConnectionParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("ClusterConnectionParameters") - $publishProfile.UpgradeDeployment = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment") - $publishProfile.CopyPackageParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("CopyPackageParameters") - - if ($publishProfileXml.PublishProfile.Item("UpgradeDeployment")) - { - $publishProfile.UpgradeDeployment.Parameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment").Item("Parameters") - if ($publishProfile.UpgradeDeployment["Mode"]) - { - $publishProfile.UpgradeDeployment.Parameters[$publishProfile.UpgradeDeployment["Mode"]] = $true - } - } - - $publishProfileFolder = (Split-Path $PublishProfileFile) - $publishProfile.ApplicationParameterFile = [System.IO.Path]::Combine($PublishProfileFolder, $publishProfileXml.PublishProfile.ApplicationParameterFile.Path) - - return $publishProfile -} - -$LocalFolder = (Split-Path $MyInvocation.MyCommand.Path) - -if (!$PublishProfileFile) -{ - $PublishProfileFile = "$LocalFolder\..\PublishProfiles\Local.xml" -} - -if (!$ApplicationPackagePath) -{ - $ApplicationPackagePath = "$LocalFolder\..\pkg\Release" -} - -$ApplicationPackagePath = Resolve-Path $ApplicationPackagePath - -$publishProfile = Read-PublishProfile $PublishProfileFile - -if (-not $UseExistingClusterConnection) -{ - $ClusterConnectionParameters = $publishProfile.ClusterConnectionParameters - if ($SecurityToken) - { - $ClusterConnectionParameters["SecurityToken"] = $SecurityToken - } - - try - { - [void](Connect-ServiceFabricCluster @ClusterConnectionParameters) - } - catch [System.Fabric.FabricObjectClosedException] - { - Write-Warning "Service Fabric cluster may not be connected." - throw - } -} - -$RegKey = "HKLM:\SOFTWARE\Microsoft\Service Fabric SDK" -$ModuleFolderPath = (Get-ItemProperty -Path $RegKey -Name FabricSDKPSModulePath).FabricSDKPSModulePath -Import-Module "$ModuleFolderPath\ServiceFabricSDK.psm1" - -$IsUpgrade = ($publishProfile.UpgradeDeployment -and $publishProfile.UpgradeDeployment.Enabled -and $OverrideUpgradeBehavior -ne 'VetoUpgrade') -or $OverrideUpgradeBehavior -eq 'ForceUpgrade' - -$PublishParameters = @{ - 'ApplicationPackagePath' = $ApplicationPackagePath - 'ApplicationParameterFilePath' = $publishProfile.ApplicationParameterFile - 'ApplicationParameter' = $ApplicationParameter - 'ErrorAction' = 'Stop' -} - -if ($publishProfile.CopyPackageParameters.CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $publishProfile.CopyPackageParameters.CopyPackageTimeoutSec -} - -if ($publishProfile.CopyPackageParameters.CompressPackage) -{ - $PublishParameters['CompressPackage'] = $publishProfile.CopyPackageParameters.CompressPackage -} - -# CopyPackageTimeoutSec parameter overrides the value from the publish profile -if ($CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $CopyPackageTimeoutSec -} - -if ($IsUpgrade) -{ - $Action = "RegisterAndUpgrade" - if ($DeployOnly) - { - $Action = "Register" - } - - $UpgradeParameters = $publishProfile.UpgradeDeployment.Parameters - - if ($OverrideUpgradeBehavior -eq 'ForceUpgrade') - { - # Warning: Do not alter these upgrade parameters. It will create an inconsistency with Visual Studio's behavior. - $UpgradeParameters = @{ UnmonitoredAuto = $true; Force = $true } - } - - $PublishParameters['Action'] = $Action - $PublishParameters['UpgradeParameters'] = $UpgradeParameters - $PublishParameters['UnregisterUnusedVersions'] = $UnregisterUnusedApplicationVersionsAfterUpgrade - - Publish-UpgradedServiceFabricApplication @PublishParameters -} -else -{ - $Action = "RegisterAndCreate" - if ($DeployOnly) - { - $Action = "Register" - } - - $PublishParameters['Action'] = $Action - $PublishParameters['OverwriteBehavior'] = $OverwriteBehavior - $PublishParameters['SkipPackageValidation'] = $SkipPackageValidation - - Publish-NewServiceFabricApplication @PublishParameters -} \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv.sfproj b/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv.sfproj deleted file mode 100644 index 1d0d025a9..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv.sfproj +++ /dev/null @@ -1,46 +0,0 @@ - - - - - 39b54901-d57d-416e-b51e-33c4017ca464 - 1.7 - 1.5 - 1.6 - v4.6.1 - - - - Debug - x64 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Service Fabric Tools\Microsoft.VisualStudio.Azure.Fabric.ApplicationProject.targets - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/packages.config b/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/packages.config deleted file mode 100644 index 3dc0a332b..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricIdSrv/eShopOnServiceFabricIdSrv/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/ApplicationManifest.xml b/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/ApplicationManifest.xml deleted file mode 100644 index 8282adb11..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/ApplicationManifest.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/WebMVCPkg/Config/Settings.xml b/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/WebMVCPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/WebMVCPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/WebMVCPkg/ServiceManifest.xml b/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/WebMVCPkg/ServiceManifest.xml deleted file mode 100644 index 55828da3e..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationPackageRoot/WebMVCPkg/ServiceManifest.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - - - - - - - eshop/webmvc-win:#{tag}# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationParameters/Cloud.xml b/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationParameters/Cloud.xml deleted file mode 100644 index d99e1573a..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationParameters/Cloud.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationParameters/Local.1Node.xml b/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationParameters/Local.1Node.xml deleted file mode 100644 index 1d59af5a6..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationParameters/Local.1Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationParameters/Local.5Node.xml b/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationParameters/Local.5Node.xml deleted file mode 100644 index 1d59af5a6..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/ApplicationParameters/Local.5Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Cloud.xml b/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Cloud.xml deleted file mode 100644 index 2ab9df11c..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Cloud.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Local.1Node.xml b/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Local.1Node.xml deleted file mode 100644 index 6e1403e96..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Local.1Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Local.5Node.xml b/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Local.5Node.xml deleted file mode 100644 index f42d759c3..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/PublishProfiles/Local.5Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/Scripts/Deploy-FabricApplication.ps1 b/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/Scripts/Deploy-FabricApplication.ps1 deleted file mode 100644 index 2897b10e8..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/Scripts/Deploy-FabricApplication.ps1 +++ /dev/null @@ -1,258 +0,0 @@ -<# -.SYNOPSIS -Deploys a Service Fabric application type to a cluster. - -.DESCRIPTION -This script deploys a Service Fabric application type to a cluster. It is invoked by Visual Studio when deploying a Service Fabric Application project. - -.NOTES -WARNING: This script file is invoked by Visual Studio. Its parameters must not be altered but its logic can be customized as necessary. - -.PARAMETER PublishProfileFile -Path to the file containing the publish profile. - -.PARAMETER ApplicationPackagePath -Path to the folder of the packaged Service Fabric application. - -.PARAMETER DeployOnly -Indicates that the Service Fabric application should not be created or upgraded after registering the application type. - -.PARAMETER ApplicationParameter -Hashtable of the Service Fabric application parameters to be used for the application. - -.PARAMETER UnregisterUnusedApplicationVersionsAfterUpgrade -Indicates whether to unregister any unused application versions that exist after an upgrade is finished. - -.PARAMETER OverrideUpgradeBehavior -Indicates the behavior used to override the upgrade settings specified by the publish profile. -'None' indicates that the upgrade settings will not be overridden. -'ForceUpgrade' indicates that an upgrade will occur with default settings, regardless of what is specified in the publish profile. -'VetoUpgrade' indicates that an upgrade will not occur, regardless of what is specified in the publish profile. - -.PARAMETER UseExistingClusterConnection -Indicates that the script should make use of an existing cluster connection that has already been established in the PowerShell session. The cluster connection parameters configured in the publish profile are ignored. - -.PARAMETER OverwriteBehavior -Overwrite Behavior if an application exists in the cluster with the same name. Available Options are Never, Always, SameAppTypeAndVersion. This setting is not applicable when upgrading an application. -'Never' will not remove the existing application. This is the default behavior. -'Always' will remove the existing application even if its Application type and Version is different from the application being created. -'SameAppTypeAndVersion' will remove the existing application only if its Application type and Version is same as the application being created. - -.PARAMETER SkipPackageValidation -Switch signaling whether the package should be validated or not before deployment. - -.PARAMETER SecurityToken -A security token for authentication to cluster management endpoints. Used for silent authentication to clusters that are protected by Azure Active Directory. - -.PARAMETER CopyPackageTimeoutSec -Timeout in seconds for copying application package to image store. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' - -Deploy the application using the default package location for a Debug build. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -DoNotCreateApplication - -Deploy the application but do not create the application instance. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -ApplicationParameter @{CustomParameter1='MyValue'; CustomParameter2='MyValue'} - -Deploy the application by providing values for parameters that are defined in the application manifest. -#> - -Param -( - [String] - $PublishProfileFile, - - [String] - $ApplicationPackagePath, - - [Switch] - $DeployOnly, - - [Hashtable] - $ApplicationParameter, - - [Boolean] - $UnregisterUnusedApplicationVersionsAfterUpgrade, - - [String] - [ValidateSet('None', 'ForceUpgrade', 'VetoUpgrade')] - $OverrideUpgradeBehavior = 'None', - - [Switch] - $UseExistingClusterConnection, - - [String] - [ValidateSet('Never','Always','SameAppTypeAndVersion')] - $OverwriteBehavior = 'Never', - - [Switch] - $SkipPackageValidation, - - [String] - $SecurityToken, - - [int] - $CopyPackageTimeoutSec -) - -function Read-XmlElementAsHashtable -{ - Param ( - [System.Xml.XmlElement] - $Element - ) - - $hashtable = @{} - if ($Element.Attributes) - { - $Element.Attributes | - ForEach-Object { - $boolVal = $null - if ([bool]::TryParse($_.Value, [ref]$boolVal)) { - $hashtable[$_.Name] = $boolVal - } - else { - $hashtable[$_.Name] = $_.Value - } - } - } - - return $hashtable -} - -function Read-PublishProfile -{ - Param ( - [ValidateScript({Test-Path $_ -PathType Leaf})] - [String] - $PublishProfileFile - ) - - $publishProfileXml = [Xml] (Get-Content $PublishProfileFile) - $publishProfile = @{} - - $publishProfile.ClusterConnectionParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("ClusterConnectionParameters") - $publishProfile.UpgradeDeployment = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment") - $publishProfile.CopyPackageParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("CopyPackageParameters") - - if ($publishProfileXml.PublishProfile.Item("UpgradeDeployment")) - { - $publishProfile.UpgradeDeployment.Parameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment").Item("Parameters") - if ($publishProfile.UpgradeDeployment["Mode"]) - { - $publishProfile.UpgradeDeployment.Parameters[$publishProfile.UpgradeDeployment["Mode"]] = $true - } - } - - $publishProfileFolder = (Split-Path $PublishProfileFile) - $publishProfile.ApplicationParameterFile = [System.IO.Path]::Combine($PublishProfileFolder, $publishProfileXml.PublishProfile.ApplicationParameterFile.Path) - - return $publishProfile -} - -$LocalFolder = (Split-Path $MyInvocation.MyCommand.Path) - -if (!$PublishProfileFile) -{ - $PublishProfileFile = "$LocalFolder\..\PublishProfiles\Local.xml" -} - -if (!$ApplicationPackagePath) -{ - $ApplicationPackagePath = "$LocalFolder\..\pkg\Release" -} - -$ApplicationPackagePath = Resolve-Path $ApplicationPackagePath - -$publishProfile = Read-PublishProfile $PublishProfileFile - -if (-not $UseExistingClusterConnection) -{ - $ClusterConnectionParameters = $publishProfile.ClusterConnectionParameters - if ($SecurityToken) - { - $ClusterConnectionParameters["SecurityToken"] = $SecurityToken - } - - try - { - [void](Connect-ServiceFabricCluster @ClusterConnectionParameters) - } - catch [System.Fabric.FabricObjectClosedException] - { - Write-Warning "Service Fabric cluster may not be connected." - throw - } -} - -$RegKey = "HKLM:\SOFTWARE\Microsoft\Service Fabric SDK" -$ModuleFolderPath = (Get-ItemProperty -Path $RegKey -Name FabricSDKPSModulePath).FabricSDKPSModulePath -Import-Module "$ModuleFolderPath\ServiceFabricSDK.psm1" - -$IsUpgrade = ($publishProfile.UpgradeDeployment -and $publishProfile.UpgradeDeployment.Enabled -and $OverrideUpgradeBehavior -ne 'VetoUpgrade') -or $OverrideUpgradeBehavior -eq 'ForceUpgrade' - -$PublishParameters = @{ - 'ApplicationPackagePath' = $ApplicationPackagePath - 'ApplicationParameterFilePath' = $publishProfile.ApplicationParameterFile - 'ApplicationParameter' = $ApplicationParameter - 'ErrorAction' = 'Stop' -} - -if ($publishProfile.CopyPackageParameters.CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $publishProfile.CopyPackageParameters.CopyPackageTimeoutSec -} - -if ($publishProfile.CopyPackageParameters.CompressPackage) -{ - $PublishParameters['CompressPackage'] = $publishProfile.CopyPackageParameters.CompressPackage -} - -# CopyPackageTimeoutSec parameter overrides the value from the publish profile -if ($CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $CopyPackageTimeoutSec -} - -if ($IsUpgrade) -{ - $Action = "RegisterAndUpgrade" - if ($DeployOnly) - { - $Action = "Register" - } - - $UpgradeParameters = $publishProfile.UpgradeDeployment.Parameters - - if ($OverrideUpgradeBehavior -eq 'ForceUpgrade') - { - # Warning: Do not alter these upgrade parameters. It will create an inconsistency with Visual Studio's behavior. - $UpgradeParameters = @{ UnmonitoredAuto = $true; Force = $true } - } - - $PublishParameters['Action'] = $Action - $PublishParameters['UpgradeParameters'] = $UpgradeParameters - $PublishParameters['UnregisterUnusedVersions'] = $UnregisterUnusedApplicationVersionsAfterUpgrade - - Publish-UpgradedServiceFabricApplication @PublishParameters -} -else -{ - $Action = "RegisterAndCreate" - if ($DeployOnly) - { - $Action = "Register" - } - - $PublishParameters['Action'] = $Action - $PublishParameters['OverwriteBehavior'] = $OverwriteBehavior - $PublishParameters['SkipPackageValidation'] = $SkipPackageValidation - - Publish-NewServiceFabricApplication @PublishParameters -} \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC.sfproj b/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC.sfproj deleted file mode 100644 index ff4ce2247..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC.sfproj +++ /dev/null @@ -1,46 +0,0 @@ - - - - - 0cf895ff-3616-4d1f-8d2e-5d856cdf3612 - 1.7 - 1.5 - 1.6 - v4.6.1 - - - - Debug - x64 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Service Fabric Tools\Microsoft.VisualStudio.Azure.Fabric.ApplicationProject.targets - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/packages.config b/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/packages.config deleted file mode 100644 index 3dc0a332b..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebMVC/eShopOnServiceFabricWebMVC/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/ApplicationManifest.xml b/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/ApplicationManifest.xml deleted file mode 100644 index e7479f239..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/ApplicationManifest.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/WebSPAPkg/Config/Settings.xml b/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/WebSPAPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/WebSPAPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml b/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml deleted file mode 100644 index a0bd28a94..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationPackageRoot/WebSPAPkg/ServiceManifest.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - eshop/webspa-win:#{tag}# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationParameters/Cloud.xml b/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationParameters/Cloud.xml deleted file mode 100644 index fdeb6fd88..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationParameters/Cloud.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationParameters/Local.1Node.xml b/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationParameters/Local.1Node.xml deleted file mode 100644 index 92fe692c3..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationParameters/Local.1Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationParameters/Local.5Node.xml b/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationParameters/Local.5Node.xml deleted file mode 100644 index 92fe692c3..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/ApplicationParameters/Local.5Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Cloud.xml b/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Cloud.xml deleted file mode 100644 index 2ab9df11c..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Cloud.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Local.1Node.xml b/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Local.1Node.xml deleted file mode 100644 index 6e1403e96..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Local.1Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Local.5Node.xml b/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Local.5Node.xml deleted file mode 100644 index f42d759c3..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/PublishProfiles/Local.5Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/Scripts/Deploy-FabricApplication.ps1 b/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/Scripts/Deploy-FabricApplication.ps1 deleted file mode 100644 index 2897b10e8..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/Scripts/Deploy-FabricApplication.ps1 +++ /dev/null @@ -1,258 +0,0 @@ -<# -.SYNOPSIS -Deploys a Service Fabric application type to a cluster. - -.DESCRIPTION -This script deploys a Service Fabric application type to a cluster. It is invoked by Visual Studio when deploying a Service Fabric Application project. - -.NOTES -WARNING: This script file is invoked by Visual Studio. Its parameters must not be altered but its logic can be customized as necessary. - -.PARAMETER PublishProfileFile -Path to the file containing the publish profile. - -.PARAMETER ApplicationPackagePath -Path to the folder of the packaged Service Fabric application. - -.PARAMETER DeployOnly -Indicates that the Service Fabric application should not be created or upgraded after registering the application type. - -.PARAMETER ApplicationParameter -Hashtable of the Service Fabric application parameters to be used for the application. - -.PARAMETER UnregisterUnusedApplicationVersionsAfterUpgrade -Indicates whether to unregister any unused application versions that exist after an upgrade is finished. - -.PARAMETER OverrideUpgradeBehavior -Indicates the behavior used to override the upgrade settings specified by the publish profile. -'None' indicates that the upgrade settings will not be overridden. -'ForceUpgrade' indicates that an upgrade will occur with default settings, regardless of what is specified in the publish profile. -'VetoUpgrade' indicates that an upgrade will not occur, regardless of what is specified in the publish profile. - -.PARAMETER UseExistingClusterConnection -Indicates that the script should make use of an existing cluster connection that has already been established in the PowerShell session. The cluster connection parameters configured in the publish profile are ignored. - -.PARAMETER OverwriteBehavior -Overwrite Behavior if an application exists in the cluster with the same name. Available Options are Never, Always, SameAppTypeAndVersion. This setting is not applicable when upgrading an application. -'Never' will not remove the existing application. This is the default behavior. -'Always' will remove the existing application even if its Application type and Version is different from the application being created. -'SameAppTypeAndVersion' will remove the existing application only if its Application type and Version is same as the application being created. - -.PARAMETER SkipPackageValidation -Switch signaling whether the package should be validated or not before deployment. - -.PARAMETER SecurityToken -A security token for authentication to cluster management endpoints. Used for silent authentication to clusters that are protected by Azure Active Directory. - -.PARAMETER CopyPackageTimeoutSec -Timeout in seconds for copying application package to image store. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' - -Deploy the application using the default package location for a Debug build. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -DoNotCreateApplication - -Deploy the application but do not create the application instance. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -ApplicationParameter @{CustomParameter1='MyValue'; CustomParameter2='MyValue'} - -Deploy the application by providing values for parameters that are defined in the application manifest. -#> - -Param -( - [String] - $PublishProfileFile, - - [String] - $ApplicationPackagePath, - - [Switch] - $DeployOnly, - - [Hashtable] - $ApplicationParameter, - - [Boolean] - $UnregisterUnusedApplicationVersionsAfterUpgrade, - - [String] - [ValidateSet('None', 'ForceUpgrade', 'VetoUpgrade')] - $OverrideUpgradeBehavior = 'None', - - [Switch] - $UseExistingClusterConnection, - - [String] - [ValidateSet('Never','Always','SameAppTypeAndVersion')] - $OverwriteBehavior = 'Never', - - [Switch] - $SkipPackageValidation, - - [String] - $SecurityToken, - - [int] - $CopyPackageTimeoutSec -) - -function Read-XmlElementAsHashtable -{ - Param ( - [System.Xml.XmlElement] - $Element - ) - - $hashtable = @{} - if ($Element.Attributes) - { - $Element.Attributes | - ForEach-Object { - $boolVal = $null - if ([bool]::TryParse($_.Value, [ref]$boolVal)) { - $hashtable[$_.Name] = $boolVal - } - else { - $hashtable[$_.Name] = $_.Value - } - } - } - - return $hashtable -} - -function Read-PublishProfile -{ - Param ( - [ValidateScript({Test-Path $_ -PathType Leaf})] - [String] - $PublishProfileFile - ) - - $publishProfileXml = [Xml] (Get-Content $PublishProfileFile) - $publishProfile = @{} - - $publishProfile.ClusterConnectionParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("ClusterConnectionParameters") - $publishProfile.UpgradeDeployment = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment") - $publishProfile.CopyPackageParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("CopyPackageParameters") - - if ($publishProfileXml.PublishProfile.Item("UpgradeDeployment")) - { - $publishProfile.UpgradeDeployment.Parameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment").Item("Parameters") - if ($publishProfile.UpgradeDeployment["Mode"]) - { - $publishProfile.UpgradeDeployment.Parameters[$publishProfile.UpgradeDeployment["Mode"]] = $true - } - } - - $publishProfileFolder = (Split-Path $PublishProfileFile) - $publishProfile.ApplicationParameterFile = [System.IO.Path]::Combine($PublishProfileFolder, $publishProfileXml.PublishProfile.ApplicationParameterFile.Path) - - return $publishProfile -} - -$LocalFolder = (Split-Path $MyInvocation.MyCommand.Path) - -if (!$PublishProfileFile) -{ - $PublishProfileFile = "$LocalFolder\..\PublishProfiles\Local.xml" -} - -if (!$ApplicationPackagePath) -{ - $ApplicationPackagePath = "$LocalFolder\..\pkg\Release" -} - -$ApplicationPackagePath = Resolve-Path $ApplicationPackagePath - -$publishProfile = Read-PublishProfile $PublishProfileFile - -if (-not $UseExistingClusterConnection) -{ - $ClusterConnectionParameters = $publishProfile.ClusterConnectionParameters - if ($SecurityToken) - { - $ClusterConnectionParameters["SecurityToken"] = $SecurityToken - } - - try - { - [void](Connect-ServiceFabricCluster @ClusterConnectionParameters) - } - catch [System.Fabric.FabricObjectClosedException] - { - Write-Warning "Service Fabric cluster may not be connected." - throw - } -} - -$RegKey = "HKLM:\SOFTWARE\Microsoft\Service Fabric SDK" -$ModuleFolderPath = (Get-ItemProperty -Path $RegKey -Name FabricSDKPSModulePath).FabricSDKPSModulePath -Import-Module "$ModuleFolderPath\ServiceFabricSDK.psm1" - -$IsUpgrade = ($publishProfile.UpgradeDeployment -and $publishProfile.UpgradeDeployment.Enabled -and $OverrideUpgradeBehavior -ne 'VetoUpgrade') -or $OverrideUpgradeBehavior -eq 'ForceUpgrade' - -$PublishParameters = @{ - 'ApplicationPackagePath' = $ApplicationPackagePath - 'ApplicationParameterFilePath' = $publishProfile.ApplicationParameterFile - 'ApplicationParameter' = $ApplicationParameter - 'ErrorAction' = 'Stop' -} - -if ($publishProfile.CopyPackageParameters.CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $publishProfile.CopyPackageParameters.CopyPackageTimeoutSec -} - -if ($publishProfile.CopyPackageParameters.CompressPackage) -{ - $PublishParameters['CompressPackage'] = $publishProfile.CopyPackageParameters.CompressPackage -} - -# CopyPackageTimeoutSec parameter overrides the value from the publish profile -if ($CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $CopyPackageTimeoutSec -} - -if ($IsUpgrade) -{ - $Action = "RegisterAndUpgrade" - if ($DeployOnly) - { - $Action = "Register" - } - - $UpgradeParameters = $publishProfile.UpgradeDeployment.Parameters - - if ($OverrideUpgradeBehavior -eq 'ForceUpgrade') - { - # Warning: Do not alter these upgrade parameters. It will create an inconsistency with Visual Studio's behavior. - $UpgradeParameters = @{ UnmonitoredAuto = $true; Force = $true } - } - - $PublishParameters['Action'] = $Action - $PublishParameters['UpgradeParameters'] = $UpgradeParameters - $PublishParameters['UnregisterUnusedVersions'] = $UnregisterUnusedApplicationVersionsAfterUpgrade - - Publish-UpgradedServiceFabricApplication @PublishParameters -} -else -{ - $Action = "RegisterAndCreate" - if ($DeployOnly) - { - $Action = "Register" - } - - $PublishParameters['Action'] = $Action - $PublishParameters['OverwriteBehavior'] = $OverwriteBehavior - $PublishParameters['SkipPackageValidation'] = $SkipPackageValidation - - Publish-NewServiceFabricApplication @PublishParameters -} \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA.sfproj b/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA.sfproj deleted file mode 100644 index 05ed606be..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA.sfproj +++ /dev/null @@ -1,46 +0,0 @@ - - - - - 1670de10-5626-429d-a74a-2dd8281cc0c9 - 1.7 - 1.5 - 1.6 - v4.6.1 - - - - Debug - x64 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Service Fabric Tools\Microsoft.VisualStudio.Azure.Fabric.ApplicationProject.targets - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/packages.config b/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/packages.config deleted file mode 100644 index 3dc0a332b..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebSPA/eShopOnServiceFabricWebSPA/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/ApplicationManifest.xml b/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/ApplicationManifest.xml deleted file mode 100644 index 20fb0c3a9..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/ApplicationManifest.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/WebStatusPkg/Config/Settings.xml b/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/WebStatusPkg/Config/Settings.xml deleted file mode 100644 index ad84ffd8a..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/WebStatusPkg/Config/Settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/WebStatusPkg/ServiceManifest.xml b/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/WebStatusPkg/ServiceManifest.xml deleted file mode 100644 index 58968f0e5..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationPackageRoot/WebStatusPkg/ServiceManifest.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - eshop/webstatus-win:#{tag}# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationParameters/Cloud.xml b/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationParameters/Cloud.xml deleted file mode 100644 index f49e04e6b..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationParameters/Cloud.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationParameters/Local.1Node.xml b/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationParameters/Local.1Node.xml deleted file mode 100644 index 9864bd050..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationParameters/Local.1Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationParameters/Local.5Node.xml b/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationParameters/Local.5Node.xml deleted file mode 100644 index 9864bd050..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/ApplicationParameters/Local.5Node.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Cloud.xml b/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Cloud.xml deleted file mode 100644 index 2ab9df11c..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Cloud.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Local.1Node.xml b/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Local.1Node.xml deleted file mode 100644 index 6e1403e96..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Local.1Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Local.5Node.xml b/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Local.5Node.xml deleted file mode 100644 index f42d759c3..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/PublishProfiles/Local.5Node.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/Scripts/Deploy-FabricApplication.ps1 b/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/Scripts/Deploy-FabricApplication.ps1 deleted file mode 100644 index 2897b10e8..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/Scripts/Deploy-FabricApplication.ps1 +++ /dev/null @@ -1,258 +0,0 @@ -<# -.SYNOPSIS -Deploys a Service Fabric application type to a cluster. - -.DESCRIPTION -This script deploys a Service Fabric application type to a cluster. It is invoked by Visual Studio when deploying a Service Fabric Application project. - -.NOTES -WARNING: This script file is invoked by Visual Studio. Its parameters must not be altered but its logic can be customized as necessary. - -.PARAMETER PublishProfileFile -Path to the file containing the publish profile. - -.PARAMETER ApplicationPackagePath -Path to the folder of the packaged Service Fabric application. - -.PARAMETER DeployOnly -Indicates that the Service Fabric application should not be created or upgraded after registering the application type. - -.PARAMETER ApplicationParameter -Hashtable of the Service Fabric application parameters to be used for the application. - -.PARAMETER UnregisterUnusedApplicationVersionsAfterUpgrade -Indicates whether to unregister any unused application versions that exist after an upgrade is finished. - -.PARAMETER OverrideUpgradeBehavior -Indicates the behavior used to override the upgrade settings specified by the publish profile. -'None' indicates that the upgrade settings will not be overridden. -'ForceUpgrade' indicates that an upgrade will occur with default settings, regardless of what is specified in the publish profile. -'VetoUpgrade' indicates that an upgrade will not occur, regardless of what is specified in the publish profile. - -.PARAMETER UseExistingClusterConnection -Indicates that the script should make use of an existing cluster connection that has already been established in the PowerShell session. The cluster connection parameters configured in the publish profile are ignored. - -.PARAMETER OverwriteBehavior -Overwrite Behavior if an application exists in the cluster with the same name. Available Options are Never, Always, SameAppTypeAndVersion. This setting is not applicable when upgrading an application. -'Never' will not remove the existing application. This is the default behavior. -'Always' will remove the existing application even if its Application type and Version is different from the application being created. -'SameAppTypeAndVersion' will remove the existing application only if its Application type and Version is same as the application being created. - -.PARAMETER SkipPackageValidation -Switch signaling whether the package should be validated or not before deployment. - -.PARAMETER SecurityToken -A security token for authentication to cluster management endpoints. Used for silent authentication to clusters that are protected by Azure Active Directory. - -.PARAMETER CopyPackageTimeoutSec -Timeout in seconds for copying application package to image store. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' - -Deploy the application using the default package location for a Debug build. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -DoNotCreateApplication - -Deploy the application but do not create the application instance. - -.EXAMPLE -. Scripts\Deploy-FabricApplication.ps1 -ApplicationPackagePath 'pkg\Debug' -ApplicationParameter @{CustomParameter1='MyValue'; CustomParameter2='MyValue'} - -Deploy the application by providing values for parameters that are defined in the application manifest. -#> - -Param -( - [String] - $PublishProfileFile, - - [String] - $ApplicationPackagePath, - - [Switch] - $DeployOnly, - - [Hashtable] - $ApplicationParameter, - - [Boolean] - $UnregisterUnusedApplicationVersionsAfterUpgrade, - - [String] - [ValidateSet('None', 'ForceUpgrade', 'VetoUpgrade')] - $OverrideUpgradeBehavior = 'None', - - [Switch] - $UseExistingClusterConnection, - - [String] - [ValidateSet('Never','Always','SameAppTypeAndVersion')] - $OverwriteBehavior = 'Never', - - [Switch] - $SkipPackageValidation, - - [String] - $SecurityToken, - - [int] - $CopyPackageTimeoutSec -) - -function Read-XmlElementAsHashtable -{ - Param ( - [System.Xml.XmlElement] - $Element - ) - - $hashtable = @{} - if ($Element.Attributes) - { - $Element.Attributes | - ForEach-Object { - $boolVal = $null - if ([bool]::TryParse($_.Value, [ref]$boolVal)) { - $hashtable[$_.Name] = $boolVal - } - else { - $hashtable[$_.Name] = $_.Value - } - } - } - - return $hashtable -} - -function Read-PublishProfile -{ - Param ( - [ValidateScript({Test-Path $_ -PathType Leaf})] - [String] - $PublishProfileFile - ) - - $publishProfileXml = [Xml] (Get-Content $PublishProfileFile) - $publishProfile = @{} - - $publishProfile.ClusterConnectionParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("ClusterConnectionParameters") - $publishProfile.UpgradeDeployment = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment") - $publishProfile.CopyPackageParameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("CopyPackageParameters") - - if ($publishProfileXml.PublishProfile.Item("UpgradeDeployment")) - { - $publishProfile.UpgradeDeployment.Parameters = Read-XmlElementAsHashtable $publishProfileXml.PublishProfile.Item("UpgradeDeployment").Item("Parameters") - if ($publishProfile.UpgradeDeployment["Mode"]) - { - $publishProfile.UpgradeDeployment.Parameters[$publishProfile.UpgradeDeployment["Mode"]] = $true - } - } - - $publishProfileFolder = (Split-Path $PublishProfileFile) - $publishProfile.ApplicationParameterFile = [System.IO.Path]::Combine($PublishProfileFolder, $publishProfileXml.PublishProfile.ApplicationParameterFile.Path) - - return $publishProfile -} - -$LocalFolder = (Split-Path $MyInvocation.MyCommand.Path) - -if (!$PublishProfileFile) -{ - $PublishProfileFile = "$LocalFolder\..\PublishProfiles\Local.xml" -} - -if (!$ApplicationPackagePath) -{ - $ApplicationPackagePath = "$LocalFolder\..\pkg\Release" -} - -$ApplicationPackagePath = Resolve-Path $ApplicationPackagePath - -$publishProfile = Read-PublishProfile $PublishProfileFile - -if (-not $UseExistingClusterConnection) -{ - $ClusterConnectionParameters = $publishProfile.ClusterConnectionParameters - if ($SecurityToken) - { - $ClusterConnectionParameters["SecurityToken"] = $SecurityToken - } - - try - { - [void](Connect-ServiceFabricCluster @ClusterConnectionParameters) - } - catch [System.Fabric.FabricObjectClosedException] - { - Write-Warning "Service Fabric cluster may not be connected." - throw - } -} - -$RegKey = "HKLM:\SOFTWARE\Microsoft\Service Fabric SDK" -$ModuleFolderPath = (Get-ItemProperty -Path $RegKey -Name FabricSDKPSModulePath).FabricSDKPSModulePath -Import-Module "$ModuleFolderPath\ServiceFabricSDK.psm1" - -$IsUpgrade = ($publishProfile.UpgradeDeployment -and $publishProfile.UpgradeDeployment.Enabled -and $OverrideUpgradeBehavior -ne 'VetoUpgrade') -or $OverrideUpgradeBehavior -eq 'ForceUpgrade' - -$PublishParameters = @{ - 'ApplicationPackagePath' = $ApplicationPackagePath - 'ApplicationParameterFilePath' = $publishProfile.ApplicationParameterFile - 'ApplicationParameter' = $ApplicationParameter - 'ErrorAction' = 'Stop' -} - -if ($publishProfile.CopyPackageParameters.CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $publishProfile.CopyPackageParameters.CopyPackageTimeoutSec -} - -if ($publishProfile.CopyPackageParameters.CompressPackage) -{ - $PublishParameters['CompressPackage'] = $publishProfile.CopyPackageParameters.CompressPackage -} - -# CopyPackageTimeoutSec parameter overrides the value from the publish profile -if ($CopyPackageTimeoutSec) -{ - $PublishParameters['CopyPackageTimeoutSec'] = $CopyPackageTimeoutSec -} - -if ($IsUpgrade) -{ - $Action = "RegisterAndUpgrade" - if ($DeployOnly) - { - $Action = "Register" - } - - $UpgradeParameters = $publishProfile.UpgradeDeployment.Parameters - - if ($OverrideUpgradeBehavior -eq 'ForceUpgrade') - { - # Warning: Do not alter these upgrade parameters. It will create an inconsistency with Visual Studio's behavior. - $UpgradeParameters = @{ UnmonitoredAuto = $true; Force = $true } - } - - $PublishParameters['Action'] = $Action - $PublishParameters['UpgradeParameters'] = $UpgradeParameters - $PublishParameters['UnregisterUnusedVersions'] = $UnregisterUnusedApplicationVersionsAfterUpgrade - - Publish-UpgradedServiceFabricApplication @PublishParameters -} -else -{ - $Action = "RegisterAndCreate" - if ($DeployOnly) - { - $Action = "Register" - } - - $PublishParameters['Action'] = $Action - $PublishParameters['OverwriteBehavior'] = $OverwriteBehavior - $PublishParameters['SkipPackageValidation'] = $SkipPackageValidation - - Publish-NewServiceFabricApplication @PublishParameters -} \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus.sfproj b/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus.sfproj deleted file mode 100644 index 1d4def7f2..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus.sfproj +++ /dev/null @@ -1,46 +0,0 @@ - - - - - 25f73fd9-b32f-401a-80e8-17c72606a7e1 - 1.7 - 1.5 - 1.6 - v4.6.1 - - - - Debug - x64 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Service Fabric Tools\Microsoft.VisualStudio.Azure.Fabric.ApplicationProject.targets - - - - - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/packages.config b/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/packages.config deleted file mode 100644 index 3dc0a332b..000000000 --- a/ServiceFabric/Windows/eShopOnServiceFabricWebStatus/eShopOnServiceFabricWebStatus/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/ServiceFabric/Windows/sfwin.sln b/ServiceFabric/Windows/sfwin.sln deleted file mode 100644 index 989ad6080..000000000 --- a/ServiceFabric/Windows/sfwin.sln +++ /dev/null @@ -1,13 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27323.2 -MinimumVisualStudioVersion = 10.0.40219.1 -Global - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {04B6E659-060F-4550-A5CA-70B9E9D8F010} - EndGlobalSection -EndGlobal