From 5691b7c8ecd441818d8566300b7510fcacf3e11d Mon Sep 17 00:00:00 2001
From: tsushi <tsushi@DESKTOP-MC5LH8Q>
Date: Fri, 12 Aug 2016 15:07:13 +0900
Subject: [PATCH] Adding DataPackage

---
 .../ConsoleRedirect/ConsoleRedirect.cs        | 14 ++++-----
 .../ConsoleRedirect/ConsoleRedirect.csproj    | 31 +++++++++++++++++++
 .../PackageRoot/ServiceManifest.xml           | 11 ++++---
 .../PackageRoot/TestData/data.txt             |  2 ++
 .../ApplicationManifest.xml                   |  4 +--
 .../PublishProfiles/Cloud.xml                 |  3 ++
 .../PublishProfiles/Local.xml                 |  2 +-
 7 files changed, 52 insertions(+), 15 deletions(-)
 create mode 100644 Chapter05/ConsoleRedirectTestApplication/ConsoleRedirect/PackageRoot/TestData/data.txt

diff --git a/Chapter05/ConsoleRedirectTestApplication/ConsoleRedirect/ConsoleRedirect.cs b/Chapter05/ConsoleRedirectTestApplication/ConsoleRedirect/ConsoleRedirect.cs
index 5a25d5e..d1d98f3 100644
--- a/Chapter05/ConsoleRedirectTestApplication/ConsoleRedirect/ConsoleRedirect.cs
+++ b/Chapter05/ConsoleRedirectTestApplication/ConsoleRedirect/ConsoleRedirect.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Fabric;
 using System.Linq;
+using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.ServiceFabric.Services.Communication.Runtime;
@@ -36,15 +37,12 @@ protected override async Task RunAsync(CancellationToken cancellationToken)
             // TODO: Replace the following sample code with your own logic 
             //       or remove this RunAsync override if it's not needed in your service.
 
-            long iterations = 0;
-
-            while (true)
+            while (!cancellationToken.IsCancellationRequested)
             {
-                cancellationToken.ThrowIfCancellationRequested();
-
-                ServiceEventSource.Current.ServiceMessage(this, "Working-{0}", ++iterations);
-
-                await Task.Delay(TimeSpan.FromSeconds(1), cancellationToken);
+                var dataPackage = this.Context.CodePackageActivationContext.GetDataPackageObject("TestData");
+                var text = File.ReadAllText(Path.Combine(dataPackage.Path, "data.txt"));
+                ServiceEventSource.Current.ServiceMessage(this, text);
+                await Task.Delay(TimeSpan.FromSeconds(5), cancellationToken);
             }
         }
     }
diff --git a/Chapter05/ConsoleRedirectTestApplication/ConsoleRedirect/ConsoleRedirect.csproj b/Chapter05/ConsoleRedirectTestApplication/ConsoleRedirect/ConsoleRedirect.csproj
index 739a622..2538d41 100644
--- a/Chapter05/ConsoleRedirectTestApplication/ConsoleRedirect/ConsoleRedirect.csproj
+++ b/Chapter05/ConsoleRedirectTestApplication/ConsoleRedirect/ConsoleRedirect.csproj
@@ -12,6 +12,21 @@
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DebugSymbols>true</DebugSymbols>
@@ -81,6 +96,22 @@
     <None Include="App.config" />
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup />
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.5.2">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.5.2 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="PackageRoot\TestData\data.txt" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Chapter05/ConsoleRedirectTestApplication/ConsoleRedirect/PackageRoot/ServiceManifest.xml b/Chapter05/ConsoleRedirectTestApplication/ConsoleRedirect/PackageRoot/ServiceManifest.xml
index 879ae8b..396d31c 100644
--- a/Chapter05/ConsoleRedirectTestApplication/ConsoleRedirect/PackageRoot/ServiceManifest.xml
+++ b/Chapter05/ConsoleRedirectTestApplication/ConsoleRedirect/PackageRoot/ServiceManifest.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ServiceManifest Name="ConsoleRedirectPkg"
-                 Version="1.0.1"
+                 Version="1.0.2"
                  xmlns="http://schemas.microsoft.com/2011/01/fabric"
                  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <ServiceTypes>
     <!-- This is the name of your ServiceType. 
          This name must match the string used in RegisterServiceType call in Program.cs. -->
-    <StatelessServiceType ServiceTypeName="ConsoleRedirectType" />
+    <StatelessServiceType  ServiceTypeName="ConsoleRedirectType"  />
   </ServiceTypes>
 
   <!-- Code package is your service executable. -->
-  <CodePackage Name="Code" Version="1.0.1">
+  <CodePackage Name="Code" Version="1.0.2">
     <SetupEntryPoint>
       <ExeHost>
         <Program>scripts\test.cmd</Program>
@@ -27,8 +27,11 @@
 
   <!-- Config package is the contents of the Config directoy under PackageRoot that contains an 
        independently-updateable and versioned set of custom configuration settings for your service. -->
-  <ConfigPackage Name="Config" Version="1.0.0" />
 
+  <ConfigPackage Name="Config" Version="1.0.1" />
+  <DataPackage Name="TestData" Version="1.0.1" />
+    
+ 
   <Resources>
     <Endpoints>
       <!-- This endpoint is used by the communication listener to obtain the port on which to 
diff --git a/Chapter05/ConsoleRedirectTestApplication/ConsoleRedirect/PackageRoot/TestData/data.txt b/Chapter05/ConsoleRedirectTestApplication/ConsoleRedirect/PackageRoot/TestData/data.txt
new file mode 100644
index 0000000..99466c6
--- /dev/null
+++ b/Chapter05/ConsoleRedirectTestApplication/ConsoleRedirect/PackageRoot/TestData/data.txt
@@ -0,0 +1,2 @@
+data text sample
+data text sample2
diff --git a/Chapter05/ConsoleRedirectTestApplication/ConsoleRedirectTestApplication/ApplicationPackageRoot/ApplicationManifest.xml b/Chapter05/ConsoleRedirectTestApplication/ConsoleRedirectTestApplication/ApplicationPackageRoot/ApplicationManifest.xml
index f1f07a3..fb4fb25 100644
--- a/Chapter05/ConsoleRedirectTestApplication/ConsoleRedirectTestApplication/ApplicationPackageRoot/ApplicationManifest.xml
+++ b/Chapter05/ConsoleRedirectTestApplication/ConsoleRedirectTestApplication/ApplicationPackageRoot/ApplicationManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ApplicationManifest xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ApplicationTypeName="ConsoleRedirectTestApplicationType" ApplicationTypeVersion="1.0.1" xmlns="http://schemas.microsoft.com/2011/01/fabric">
+<ApplicationManifest xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ApplicationTypeName="ConsoleRedirectTestApplicationType" ApplicationTypeVersion="1.0.2" xmlns="http://schemas.microsoft.com/2011/01/fabric">
   <Parameters>
     <Parameter Name="ConsoleRedirect_InstanceCount" DefaultValue="-1" />
   </Parameters>
@@ -7,7 +7,7 @@
        should match the Name and Version attributes of the ServiceManifest element defined in the 
        ServiceManifest.xml file. -->
   <ServiceManifestImport>
-    <ServiceManifestRef ServiceManifestName="ConsoleRedirectPkg" ServiceManifestVersion="1.0.1" />
+    <ServiceManifestRef ServiceManifestName="ConsoleRedirectPkg" ServiceManifestVersion="1.0.2" />
     <ConfigOverrides />
   </ServiceManifestImport>
   <DefaultServices>
diff --git a/Chapter05/ConsoleRedirectTestApplication/ConsoleRedirectTestApplication/PublishProfiles/Cloud.xml b/Chapter05/ConsoleRedirectTestApplication/ConsoleRedirectTestApplication/PublishProfiles/Cloud.xml
index 1301dd8..67d9b96 100644
--- a/Chapter05/ConsoleRedirectTestApplication/ConsoleRedirectTestApplication/PublishProfiles/Cloud.xml
+++ b/Chapter05/ConsoleRedirectTestApplication/ConsoleRedirectTestApplication/PublishProfiles/Cloud.xml
@@ -22,4 +22,7 @@
   -->
   <ClusterConnectionParameters ConnectionEndpoint="" />
   <ApplicationParameterFile Path="..\ApplicationParameters\Cloud.xml" />
+  <UpgradeDeployment Mode="Monitored" Enabled="false">
+    <Parameters FailureAction="Rollback" Force="True" />
+  </UpgradeDeployment>
 </PublishProfile>
\ No newline at end of file
diff --git a/Chapter05/ConsoleRedirectTestApplication/ConsoleRedirectTestApplication/PublishProfiles/Local.xml b/Chapter05/ConsoleRedirectTestApplication/ConsoleRedirectTestApplication/PublishProfiles/Local.xml
index 55fc650..90f905b 100644
--- a/Chapter05/ConsoleRedirectTestApplication/ConsoleRedirectTestApplication/PublishProfiles/Local.xml
+++ b/Chapter05/ConsoleRedirectTestApplication/ConsoleRedirectTestApplication/PublishProfiles/Local.xml
@@ -8,7 +8,7 @@
   -->
   <ClusterConnectionParameters />
   <ApplicationParameterFile Path="..\ApplicationParameters\Local.xml" />
-  <UpgradeDeployment Mode="UnmonitoredAuto" Enabled="false">
+  <UpgradeDeployment Mode="UnmonitoredAuto" Enabled="true">
     <Parameters UpgradeReplicaSetCheckTimeoutSec="1" Force="True" />
   </UpgradeDeployment>
 </PublishProfile>
\ No newline at end of file