aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2019-08-06 07:43:07 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2019-08-06 07:43:07 +0300
commitff09af0e3338a55c89d2846454d360e702d4e742 (patch)
treee4bdf1dd657645a1d27180a905534bd3c3881375
parentaef853984c03ea790bf269bd9a8daee4cbd596e1 (diff)
downloadTango-ff09af0e3338a55c89d2846454d360e702d4e742.tar.gz
Tango-ff09af0e3338a55c89d2846454d360e702d4e742.zip
Added Alpha/Beta ENV.
-rw-r--r--Software/Visual_Studio/Resources/Pulse/Sankelloff_Rol.twnbin0 -> 2720855 bytes
-rw-r--r--Software/Visual_Studio/Tango.UnitTesting/Pulse/Pulse_TST.cs2
-rw-r--r--Software/Visual_Studio/Tango.Web/DeploymentSlot.cs6
-rw-r--r--Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Alpha.pubxml28
-rw-r--r--Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Beta.pubxml28
-rw-r--r--Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Publish Machine Service via FTP.pubxml21
-rw-r--r--Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj5
7 files changed, 66 insertions, 24 deletions
diff --git a/Software/Visual_Studio/Resources/Pulse/Sankelloff_Rol.twn b/Software/Visual_Studio/Resources/Pulse/Sankelloff_Rol.twn
new file mode 100644
index 000000000..e3c96d449
--- /dev/null
+++ b/Software/Visual_Studio/Resources/Pulse/Sankelloff_Rol.twn
Binary files differ
diff --git a/Software/Visual_Studio/Tango.UnitTesting/Pulse/Pulse_TST.cs b/Software/Visual_Studio/Tango.UnitTesting/Pulse/Pulse_TST.cs
index b643e71ec..19afb93d4 100644
--- a/Software/Visual_Studio/Tango.UnitTesting/Pulse/Pulse_TST.cs
+++ b/Software/Visual_Studio/Tango.UnitTesting/Pulse/Pulse_TST.cs
@@ -73,7 +73,7 @@ namespace Tango.UnitTesting.Pulse
[TestMethod]
public void Read_Pulse_Sample_File()
{
- String sampleFile = Path.Combine(Helper.GetResourcePath(), "Pulse", "New twine gradients.TWN");
+ String sampleFile = Path.Combine(Helper.GetResourcePath(), "Pulse", "Sankelloff_Rol.twn");
TwnFile twnFile = TwnFile.FromFile(sampleFile);
var imgFile = TemporaryManager.Default.CreateFile(".png");
diff --git a/Software/Visual_Studio/Tango.Web/DeploymentSlot.cs b/Software/Visual_Studio/Tango.Web/DeploymentSlot.cs
index 6531adb64..0e470a735 100644
--- a/Software/Visual_Studio/Tango.Web/DeploymentSlot.cs
+++ b/Software/Visual_Studio/Tango.Web/DeploymentSlot.cs
@@ -18,6 +18,12 @@ namespace Tango.Web
[Description("Process")]
[DeploymentSlotAddress("https://machineservice-process.twine-srv.com")]
PROCESS,
+ [Description("Alpha")]
+ [DeploymentSlotAddress("https://machineservice-alpha.twine-srv.com")]
+ ALPHA,
+ [Description("Beta")]
+ [DeploymentSlotAddress("https://machineservice-beta.twine-srv.com")]
+ BETA,
[Description("Staging")]
[DeploymentSlotAddress("https://machineservice-stage.twine-srv.com")]
STAGE,
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Alpha.pubxml b/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Alpha.pubxml
new file mode 100644
index 000000000..3632deaac
--- /dev/null
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Alpha.pubxml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <WebPublishMethod>MSDeploy</WebPublishMethod>
+ <ResourceId>/subscriptions/10c8aa60-3b15-4e0d-b412-6aeef90e5e91/resourceGroups/Tango/providers/Microsoft.Web/sites/machineservice-alpha-beta/slots/MachineService-ALPHA</ResourceId>
+ <ResourceGroup>Tango</ResourceGroup>
+ <PublishProvider>AzureWebSite</PublishProvider>
+ <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+ <LastUsedPlatform>Any CPU</LastUsedPlatform>
+ <SiteUrlToLaunchAfterPublish>http://machineservice-alpha-beta-machineservice-alpha.azurewebsites.net</SiteUrlToLaunchAfterPublish>
+ <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+ <ExcludeApp_Data>False</ExcludeApp_Data>
+ <MSDeployServiceURL>machineservice-alpha-beta-machineservice-alpha.scm.azurewebsites.net:443</MSDeployServiceURL>
+ <DeployIisAppPath>machineservice-alpha-beta__MachineService-ALPHA</DeployIisAppPath>
+ <RemoteSitePhysicalPath />
+ <SkipExtraFilesOnServer>True</SkipExtraFilesOnServer>
+ <InstallAspNetCoreSiteExtension>False</InstallAspNetCoreSiteExtension>
+ <MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
+ <EnableMSDeployBackup>True</EnableMSDeployBackup>
+ <UserName>$machineservice-alpha-beta__MachineService-ALPHA</UserName>
+ <_SavePWD>True</_SavePWD>
+ <_DestinationType>AzureWebSite</_DestinationType>
+ </PropertyGroup>
+</Project> \ No newline at end of file
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Beta.pubxml b/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Beta.pubxml
new file mode 100644
index 000000000..e02abdacc
--- /dev/null
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Beta.pubxml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+This file is used by the publish/package process of your Web project. You can customize the behavior of this process
+by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <WebPublishMethod>MSDeploy</WebPublishMethod>
+ <ResourceId>/subscriptions/10c8aa60-3b15-4e0d-b412-6aeef90e5e91/resourceGroups/Tango/providers/Microsoft.Web/sites/machineservice-alpha-beta/slots/MachineService-BETA</ResourceId>
+ <ResourceGroup>Tango</ResourceGroup>
+ <PublishProvider>AzureWebSite</PublishProvider>
+ <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
+ <LastUsedPlatform>Any CPU</LastUsedPlatform>
+ <SiteUrlToLaunchAfterPublish>http://machineservice-alpha-beta-machineservice-beta.azurewebsites.net</SiteUrlToLaunchAfterPublish>
+ <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
+ <ExcludeApp_Data>False</ExcludeApp_Data>
+ <MSDeployServiceURL>machineservice-alpha-beta-machineservice-beta.scm.azurewebsites.net:443</MSDeployServiceURL>
+ <DeployIisAppPath>machineservice-alpha-beta__MachineService-BETA</DeployIisAppPath>
+ <RemoteSitePhysicalPath />
+ <SkipExtraFilesOnServer>True</SkipExtraFilesOnServer>
+ <InstallAspNetCoreSiteExtension>False</InstallAspNetCoreSiteExtension>
+ <MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
+ <EnableMSDeployBackup>True</EnableMSDeployBackup>
+ <UserName>$machineservice-alpha-beta__MachineService-BETA</UserName>
+ <_SavePWD>True</_SavePWD>
+ <_DestinationType>AzureWebSite</_DestinationType>
+ </PropertyGroup>
+</Project> \ No newline at end of file
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Publish Machine Service via FTP.pubxml b/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Publish Machine Service via FTP.pubxml
deleted file mode 100644
index bd9a693e0..000000000
--- a/Software/Visual_Studio/Web/Tango.MachineService/Properties/PublishProfiles/Publish Machine Service via FTP.pubxml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This file is used by the publish/package process of your Web project. You can customize the behavior of this process
-by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121.
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <WebPublishMethod>FTP</WebPublishMethod>
- <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
- <LastUsedPlatform>Any CPU</LastUsedPlatform>
- <SiteUrlToLaunchAfterPublish />
- <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
- <ExcludeApp_Data>False</ExcludeApp_Data>
- <publishUrl>twine01</publishUrl>
- <DeleteExistingFiles>True</DeleteExistingFiles>
- <FtpPassiveMode>True</FtpPassiveMode>
- <FtpSitePath>MachineService</FtpSitePath>
- <UserName>PublishFTP|Roy</UserName>
- <_SavePWD>False</_SavePWD>
- </PropertyGroup>
-</Project> \ No newline at end of file
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj
index 52ecba507..f6040c5b1 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Tango.MachineService.csproj
@@ -313,6 +313,8 @@
<Content Include="Scripts\Account\Login.js" />
<Content Include="Scripts\bootstrap.js" />
<Content Include="Scripts\bootstrap.min.js" />
+ <None Include="Properties\PublishProfiles\Beta.pubxml" />
+ <None Include="Properties\PublishProfiles\Alpha.pubxml" />
<None Include="Scripts\jquery-3.3.1.intellisense.js" />
<Content Include="Scripts\jquery-3.3.1.js" />
<Content Include="Scripts\jquery-3.3.1.min.js" />
@@ -381,7 +383,6 @@
<None Include="Properties\PublishProfiles\Process.pubxml" />
<None Include="Properties\PublishProfiles\Testing.pubxml" />
<None Include="Properties\PublishProfiles\Production.pubxml" />
- <None Include="Properties\PublishProfiles\Publish Machine Service via FTP.pubxml" />
<Content Include="Views\Downloads\Index.cshtml" />
<Content Include="Views\Shared\Error.cshtml" />
<Content Include="Views\Shared\_Layout.cshtml" />
@@ -417,7 +418,7 @@
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties>
</FlavorProperties>
- <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+ <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
</VisualStudio>
</ProjectExtensions>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">