From a3fe94d4f14a178b1c70f210ffb1e2976d5538f0 Mon Sep 17 00:00:00 2001 From: Sukanya Srinivasan Date: Tue, 17 Aug 2021 00:23:16 -0700 Subject: [PATCH] Update SF .NET Core Getting Started Sample to 8.1 CU1 --- Actors/CalculatorActor/build.ps1 | 13 +++++--- Actors/CalculatorActor/install.ps1 | 5 ++- .../CalculatorActor.Interfaces.csproj | 2 +- .../CalculatorActor/CalculatorActor.csproj | 6 ++-- .../CalculatorActorTestClient.csproj | 2 +- Actors/CounterActor/build.ps1 | 14 ++++---- Actors/CounterActor/install.ps1 | 5 ++- .../CounterActor.Interfaces.csproj | 2 +- .../CounterActorWebService.csproj | 4 +-- .../CounterActor/CounterActor.csproj | 6 ++-- .../CounterActorTestClient.csproj | 2 +- .../ApplicationManifest.xml | 2 +- Actors/VisualObjects/build.ps1 | 33 ++++++++++--------- Actors/VisualObjects/install.ps1 | 5 ++- .../VisualObjects.ActorService.csproj | 6 ++-- .../VisualObjects.Common.csproj | 2 +- .../VisualObjects.WebService.csproj | 6 ++-- Services/CounterService/build.ps1 | 12 ++++--- Services/CounterService/install.ps1 | 5 ++- .../CounterService.Interfaces.csproj | 4 +-- .../CounterServiceWebService.csproj | 4 +-- .../CounterService/CounterService.csproj | 16 +++++---- 22 files changed, 90 insertions(+), 66 deletions(-) diff --git a/Actors/CalculatorActor/build.ps1 b/Actors/CalculatorActor/build.ps1 index 508ccaf..102069b 100644 --- a/Actors/CalculatorActor/build.ps1 +++ b/Actors/CalculatorActor/build.ps1 @@ -1,16 +1,19 @@ -pushd src\CalculatorActorApplication\CalculatorActor.Interfaces\ +$invocation = (Get-Variable MyInvocation).Value +$rootpath = Split-Path $invocation.MyCommand.Path + +pushd $rootpath\src\CalculatorActorApplication\CalculatorActor.Interfaces\ dotnet restore -s https://api.nuget.org/v3/index.json dotnet build popd -pushd src\CalculatorActorApplication\CalculatorActor\ +pushd $rootpath\src\CalculatorActorApplication\CalculatorActor\ dotnet restore -s https://api.nuget.org/v3/index.json dotnet build -dotnet publish -c Release --self-contained --runtime win-x64 -o ..\..\..\CalculatorActorApplication\CalculatorActorPkg\Code +dotnet publish -c Release --self-contained --runtime win-x64 -o ..\CalculatorActorPkg\Code popd -pushd src\CalculatorActorApplication\CalculatorActorTestClient\ +pushd $rootpath\src\CalculatorActorApplication\CalculatorActorTestClient\ dotnet restore -s https://api.nuget.org/v3/index.json dotnet build -dotnet publish -c Release --self-contained --runtime win-x64 -o ..\..\..\CalculatorActorTestClient +dotnet publish -c Release --self-contained --runtime win-x64 -o ..\CalculatorActorTestClient popd \ No newline at end of file diff --git a/Actors/CalculatorActor/install.ps1 b/Actors/CalculatorActor/install.ps1 index 3b91356..9afc4c2 100644 --- a/Actors/CalculatorActor/install.ps1 +++ b/Actors/CalculatorActor/install.ps1 @@ -1,4 +1,7 @@ -$AppPath = "$PSScriptRoot\CalculatorActorApplication" +$invocation = (Get-Variable MyInvocation).Value +$rootpath = Split-Path $invocation.MyCommand.Path + +$AppPath = "$rootpath\CalculatorActorApplication" $sdkInstallPath = (Get-ItemProperty 'HKLM:\Software\Microsoft\Service Fabric SDK').FabricSDKInstallPath $sfSdkPsModulePath = $sdkInstallPath + "Tools\PSModule\ServiceFabricSDK" Import-Module $sfSdkPsModulePath\ServiceFabricSDK.psm1 diff --git a/Actors/CalculatorActor/src/CalculatorActorApplication/CalculatorActor.Interfaces/CalculatorActor.Interfaces.csproj b/Actors/CalculatorActor/src/CalculatorActorApplication/CalculatorActor.Interfaces/CalculatorActor.Interfaces.csproj index 369a460..0e1c4a9 100755 --- a/Actors/CalculatorActor/src/CalculatorActorApplication/CalculatorActor.Interfaces/CalculatorActor.Interfaces.csproj +++ b/Actors/CalculatorActor/src/CalculatorActorApplication/CalculatorActor.Interfaces/CalculatorActor.Interfaces.csproj @@ -11,7 +11,7 @@ - + diff --git a/Actors/CalculatorActor/src/CalculatorActorApplication/CalculatorActor/CalculatorActor.csproj b/Actors/CalculatorActor/src/CalculatorActorApplication/CalculatorActor/CalculatorActor.csproj index 807f091..a2de455 100755 --- a/Actors/CalculatorActor/src/CalculatorActorApplication/CalculatorActor/CalculatorActor.csproj +++ b/Actors/CalculatorActor/src/CalculatorActorApplication/CalculatorActor/CalculatorActor.csproj @@ -15,15 +15,15 @@ - + - - + + diff --git a/Actors/CalculatorActor/src/CalculatorActorApplication/CalculatorActorTestClient/CalculatorActorTestClient.csproj b/Actors/CalculatorActor/src/CalculatorActorApplication/CalculatorActorTestClient/CalculatorActorTestClient.csproj index a48643a..f061deb 100755 --- a/Actors/CalculatorActor/src/CalculatorActorApplication/CalculatorActorTestClient/CalculatorActorTestClient.csproj +++ b/Actors/CalculatorActor/src/CalculatorActorApplication/CalculatorActorTestClient/CalculatorActorTestClient.csproj @@ -15,7 +15,7 @@ - + diff --git a/Actors/CounterActor/build.ps1 b/Actors/CounterActor/build.ps1 index d2213d1..6e897f8 100644 --- a/Actors/CounterActor/build.ps1 +++ b/Actors/CounterActor/build.ps1 @@ -1,22 +1,24 @@ +$invocation = (Get-Variable MyInvocation).Value +$rootpath = Split-Path $invocation.MyCommand.Path -pushd src\CounterActorApplication\CounterActor.Interfaces\ +pushd $rootpath\src\CounterActorApplication\CounterActor.Interfaces\ dotnet restore -s https://api.nuget.org/v3/index.json dotnet build popd -pushd src\CounterActorApplication\CounterActor\ +pushd $rootpath\src\CounterActorApplication\CounterActor\ dotnet restore -s https://api.nuget.org/v3/index.json dotnet build -dotnet publish -c Release --self-contained --runtime win-x64 -o ..\..\..\CounterActorApplicationCSharp\CounterActorPkg\Code +dotnet publish -c Release --self-contained --runtime win-x64 -o .\CounterActorApplicationCSharp\CounterActorPkg\Code popd -pushd src\CounterActorApplication\CounterActorTestClient\ +pushd $rootpath\src\CounterActorApplication\CounterActorTestClient\ dotnet restore -s https://api.nuget.org/v3/index.json dotnet build -dotnet publish -c Release --self-contained --runtime win-x64 -o ..\..\..\CounterActorTestClient +dotnet publish -c Release --self-contained --runtime win-x64 -o .\CounterActorTestClient popd -pushd src\CounterActorApplication\CounterActor.WebService\CounterActorWebService\ +pushd $rootpath\src\CounterActorApplication\CounterActor.WebService\CounterActorWebService\ dotnet restore -s https://api.nuget.org/v3/index.json dotnet build dotnet publish -c Release --self-contained --runtime win-x64 -o ..\..\..\..\CounterActorApplicationCSharp\CounterActorWebServicePkg\Code\ diff --git a/Actors/CounterActor/install.ps1 b/Actors/CounterActor/install.ps1 index c779b1d..95b0994 100644 --- a/Actors/CounterActor/install.ps1 +++ b/Actors/CounterActor/install.ps1 @@ -1,4 +1,7 @@ -$AppPath = "$PSScriptRoot\CounterActorApplicationCSharp" +$invocation = (Get-Variable MyInvocation).Value +$rootpath = Split-Path $invocation.MyCommand.Path + +$AppPath = "$rootpath\CounterActorApplicationCSharp" $sdkInstallPath = (Get-ItemProperty 'HKLM:\Software\Microsoft\Service Fabric SDK').FabricSDKInstallPath $sfSdkPsModulePath = $sdkInstallPath + "Tools\PSModule\ServiceFabricSDK" Import-Module $sfSdkPsModulePath\ServiceFabricSDK.psm1 diff --git a/Actors/CounterActor/src/CounterActorApplication/CounterActor.Interfaces/CounterActor.Interfaces.csproj b/Actors/CounterActor/src/CounterActorApplication/CounterActor.Interfaces/CounterActor.Interfaces.csproj index 343264f..0c04205 100755 --- a/Actors/CounterActor/src/CounterActorApplication/CounterActor.Interfaces/CounterActor.Interfaces.csproj +++ b/Actors/CounterActor/src/CounterActorApplication/CounterActor.Interfaces/CounterActor.Interfaces.csproj @@ -11,7 +11,7 @@ - + diff --git a/Actors/CounterActor/src/CounterActorApplication/CounterActor.WebService/CounterActorWebService/CounterActorWebService.csproj b/Actors/CounterActor/src/CounterActorApplication/CounterActor.WebService/CounterActorWebService/CounterActorWebService.csproj index 48267b4..d542c8d 100755 --- a/Actors/CounterActor/src/CounterActorApplication/CounterActor.WebService/CounterActorWebService/CounterActorWebService.csproj +++ b/Actors/CounterActor/src/CounterActorApplication/CounterActor.WebService/CounterActorWebService/CounterActorWebService.csproj @@ -15,14 +15,14 @@ - + - + diff --git a/Actors/CounterActor/src/CounterActorApplication/CounterActor/CounterActor.csproj b/Actors/CounterActor/src/CounterActorApplication/CounterActor/CounterActor.csproj index 6f4c39f..a97ff7e 100755 --- a/Actors/CounterActor/src/CounterActorApplication/CounterActor/CounterActor.csproj +++ b/Actors/CounterActor/src/CounterActorApplication/CounterActor/CounterActor.csproj @@ -15,15 +15,15 @@ - + - - + + diff --git a/Actors/CounterActor/src/CounterActorApplication/CounterActorTestClient/CounterActorTestClient.csproj b/Actors/CounterActor/src/CounterActorApplication/CounterActorTestClient/CounterActorTestClient.csproj index d80f7ea..232d106 100755 --- a/Actors/CounterActor/src/CounterActorApplication/CounterActorTestClient/CounterActorTestClient.csproj +++ b/Actors/CounterActor/src/CounterActorApplication/CounterActorTestClient/CounterActorTestClient.csproj @@ -15,7 +15,7 @@ - + diff --git a/Actors/VisualObjects/VisualObjectsApplicationCSharp/ApplicationManifest.xml b/Actors/VisualObjects/VisualObjectsApplicationCSharp/ApplicationManifest.xml index c05c1c2..71c88a9 100644 --- a/Actors/VisualObjects/VisualObjectsApplicationCSharp/ApplicationManifest.xml +++ b/Actors/VisualObjects/VisualObjectsApplicationCSharp/ApplicationManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/Actors/VisualObjects/build.ps1 b/Actors/VisualObjects/build.ps1 index ba378e3..1cfe91f 100644 --- a/Actors/VisualObjects/build.ps1 +++ b/Actors/VisualObjects/build.ps1 @@ -1,32 +1,35 @@ +$invocation = (Get-Variable MyInvocation).Value +$rootpath = Split-Path $invocation.MyCommand.Path + rm -Recurse VisualObjectsApplicationCSharp mkdir VisualObjectsApplicationCSharp -pushd src\VisualObjects.Common\ +pushd $rootpath\src\VisualObjects.Common\ dotnet restore -s https://api.nuget.org/v3/index.json dotnet build popd -pushd src\VisualObjects.ActorService\ +pushd $rootpath\src\VisualObjects.ActorService\ dotnet restore -s https://api.nuget.org/v3/index.json dotnet build dotnet publish -c Release --self-contained --runtime win-x64 -o ..\..\VisualObjectsApplicationCSharp\VisualObjects.ActorServicePkg\Code popd -pushd src\VisualObjects.WebService\ +pushd $rootpath\src\VisualObjects.WebService\ dotnet restore -s https://api.nuget.org/v3/index.json dotnet build dotnet publish -c Release --self-contained --runtime win-x64 -o ..\..\VisualObjectsApplicationCSharp\VisualObjects.WebServicePkg\Code popd -cp ApplicationManifest.xml VisualObjectsApplicationCSharp\. -cp src\VisualObjects.ActorService\PackageRoot\ServiceManifest-Linux.xml VisualObjectsApplicationCSharp\VisualObjects.ActorServicePkg\. -cp src\VisualObjects.ActorService\PackageRoot\ServiceManifest-Windows.xml VisualObjectsApplicationCSharp\VisualObjects.ActorServicePkg\. -cp src\VisualObjects.WebService\PackageRoot\ServiceManifest-Linux.xml VisualObjectsApplicationCSharp\VisualObjects.WebServicePkg\. -cp src\VisualObjects.WebService\PackageRoot\ServiceManifest-Windows.xml VisualObjectsApplicationCSharp\VisualObjects.WebServicePkg\. -cp -r -Force src\VisualObjects.WebService\wwwroot VisualObjectsApplicationCSharp\VisualObjects.WebServicePkg\Code\. -cp src\VisualObjects.WebService\entryPoint.sh VisualObjectsApplicationCSharp\VisualObjects.WebServicePkg\Code\. -cp src\VisualObjects.ActorService\entryPoint.sh VisualObjectsApplicationCSharp\VisualObjects.ActorServicePkg\Code\. -cp src\VisualObjects.WebService\entryPoint.cmd VisualObjectsApplicationCSharp\VisualObjects.WebServicePkg\Code\. -cp src\VisualObjects.ActorService\entryPoint.cmd VisualObjectsApplicationCSharp\VisualObjects.ActorServicePkg\Code\. -cp -r src\VisualObjects.WebService\PackageRoot\Config VisualObjectsApplicationCSharp\VisualObjects.WebServicePkg\. -cp -r src\VisualObjects.ActorService\PackageRoot\Config VisualObjectsApplicationCSharp\VisualObjects.ActorServicePkg\. +cp $rootpath\ApplicationManifest.xml $rootpath\VisualObjectsApplicationCSharp\. +cp $rootpath\src\VisualObjects.ActorService\PackageRoot\ServiceManifest-Linux.xml $rootpath\VisualObjectsApplicationCSharp\VisualObjects.ActorServicePkg\. +cp $rootpath\src\VisualObjects.ActorService\PackageRoot\ServiceManifest-Windows.xml $rootpath\VisualObjectsApplicationCSharp\VisualObjects.ActorServicePkg\. +cp $rootpath\src\VisualObjects.WebService\PackageRoot\ServiceManifest-Linux.xml $rootpath\VisualObjectsApplicationCSharp\VisualObjects.WebServicePkg\. +cp $rootpath\src\VisualObjects.WebService\PackageRoot\ServiceManifest-Windows.xml $rootpath\VisualObjectsApplicationCSharp\VisualObjects.WebServicePkg\. +cp -r -Force $rootpath\src\VisualObjects.WebService\wwwroot $rootpath\VisualObjectsApplicationCSharp\VisualObjects.WebServicePkg\Code\. +cp $rootpath\src\VisualObjects.WebService\entryPoint.sh $rootpath\VisualObjectsApplicationCSharp\VisualObjects.WebServicePkg\Code\. +cp $rootpath\src\VisualObjects.ActorService\entryPoint.sh $rootpath\VisualObjectsApplicationCSharp\VisualObjects.ActorServicePkg\Code\. +cp $rootpath\src\VisualObjects.WebService\entryPoint.cmd $rootpath\VisualObjectsApplicationCSharp\VisualObjects.WebServicePkg\Code\. +cp $rootpath\src\VisualObjects.ActorService\entryPoint.cmd $rootpath\VisualObjectsApplicationCSharp\VisualObjects.ActorServicePkg\Code\. +cp -r -Force $rootpath\src\VisualObjects.WebService\PackageRoot\Config $rootpath\VisualObjectsApplicationCSharp\VisualObjects.WebServicePkg\. +cp -r -Force $rootpath\src\VisualObjects.ActorService\PackageRoot\Config $rootpath\VisualObjectsApplicationCSharp\VisualObjects.ActorServicePkg\. diff --git a/Actors/VisualObjects/install.ps1 b/Actors/VisualObjects/install.ps1 index 643e993..361c4ae 100644 --- a/Actors/VisualObjects/install.ps1 +++ b/Actors/VisualObjects/install.ps1 @@ -1,4 +1,7 @@ -$AppPath = "$PSScriptRoot\VisualObjectsApplicationCSharp" +$invocation = (Get-Variable MyInvocation).Value +$rootpath = Split-Path $invocation.MyCommand.Path + +$AppPath = "$rootpath\VisualObjectsApplicationCSharp" $sdkInstallPath = (Get-ItemProperty 'HKLM:\Software\Microsoft\Service Fabric SDK').FabricSDKInstallPath $sfSdkPsModulePath = $sdkInstallPath + "Tools\PSModule\ServiceFabricSDK" Import-Module $sfSdkPsModulePath\ServiceFabricSDK.psm1 diff --git a/Actors/VisualObjects/src/VisualObjects.ActorService/VisualObjects.ActorService.csproj b/Actors/VisualObjects/src/VisualObjects.ActorService/VisualObjects.ActorService.csproj index fd52e4d..61dcbc7 100755 --- a/Actors/VisualObjects/src/VisualObjects.ActorService/VisualObjects.ActorService.csproj +++ b/Actors/VisualObjects/src/VisualObjects.ActorService/VisualObjects.ActorService.csproj @@ -24,15 +24,15 @@ - + - - + + diff --git a/Actors/VisualObjects/src/VisualObjects.Common/VisualObjects.Common.csproj b/Actors/VisualObjects/src/VisualObjects.Common/VisualObjects.Common.csproj index e42b709..aea5d50 100755 --- a/Actors/VisualObjects/src/VisualObjects.Common/VisualObjects.Common.csproj +++ b/Actors/VisualObjects/src/VisualObjects.Common/VisualObjects.Common.csproj @@ -20,7 +20,7 @@ - + diff --git a/Actors/VisualObjects/src/VisualObjects.WebService/VisualObjects.WebService.csproj b/Actors/VisualObjects/src/VisualObjects.WebService/VisualObjects.WebService.csproj index b268852..377894f 100644 --- a/Actors/VisualObjects/src/VisualObjects.WebService/VisualObjects.WebService.csproj +++ b/Actors/VisualObjects/src/VisualObjects.WebService/VisualObjects.WebService.csproj @@ -39,15 +39,15 @@ - + - - + + diff --git a/Services/CounterService/build.ps1 b/Services/CounterService/build.ps1 index 2d9cef1..87a653b 100644 --- a/Services/CounterService/build.ps1 +++ b/Services/CounterService/build.ps1 @@ -1,16 +1,18 @@ -pushd src\CounterServiceApplication\CounterService.Interfaces\ +$invocation = (Get-Variable MyInvocation).Value +$rootpath = Split-Path $invocation.MyCommand.Path + +pushd $rootpath\src\CounterServiceApplication\CounterService.Interfaces\ dotnet restore -s https://api.nuget.org/v3/index.json dotnet build popd -pushd src\CounterServiceApplication\CounterService\ +pushd $rootpath\src\CounterServiceApplication\CounterService\ dotnet restore -s https://api.nuget.org/v3/index.json dotnet build -dotnet publish -c Release --self-contained --runtime win-x64 -o ..\..\..\CounterServiceApplication\CounterServicePkg\Code +dotnet publish -c Release --self-contained --runtime win-x64 -o ..\..\CounterServicePkg\Code popd - -pushd src\CounterServiceApplication\CounterService.WebService\CounterServiceWebService\ +pushd $rootpath\src\CounterServiceApplication\CounterService.WebService\CounterServiceWebService\ dotnet restore -s https://api.nuget.org/v3/index.json dotnet build dotnet publish -c Release --self-contained --runtime win-x64 -o ..\..\..\..\CounterServiceApplication\CounterServiceWebServicePkg\Code\ diff --git a/Services/CounterService/install.ps1 b/Services/CounterService/install.ps1 index e0919b1..5c1e4a7 100644 --- a/Services/CounterService/install.ps1 +++ b/Services/CounterService/install.ps1 @@ -1,4 +1,7 @@ -$AppPath = "$PSScriptRoot\CounterServiceApplication" +$invocation = (Get-Variable MyInvocation).Value +$rootpath = Split-Path $invocation.MyCommand.Path + +$AppPath = "$rootpath\CounterServiceApplication" $sdkInstallPath = (Get-ItemProperty 'HKLM:\Software\Microsoft\Service Fabric SDK').FabricSDKInstallPath $sfSdkPsModulePath = $sdkInstallPath + "Tools\PSModule\ServiceFabricSDK" Import-Module $sfSdkPsModulePath\ServiceFabricSDK.psm1 diff --git a/Services/CounterService/src/CounterServiceApplication/CounterService.Interfaces/CounterService.Interfaces.csproj b/Services/CounterService/src/CounterServiceApplication/CounterService.Interfaces/CounterService.Interfaces.csproj index 50bd91f..929151f 100755 --- a/Services/CounterService/src/CounterServiceApplication/CounterService.Interfaces/CounterService.Interfaces.csproj +++ b/Services/CounterService/src/CounterServiceApplication/CounterService.Interfaces/CounterService.Interfaces.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/Services/CounterService/src/CounterServiceApplication/CounterService.WebService/CounterServiceWebService/CounterServiceWebService.csproj b/Services/CounterService/src/CounterServiceApplication/CounterService.WebService/CounterServiceWebService/CounterServiceWebService.csproj index 512557f..a54c09c 100755 --- a/Services/CounterService/src/CounterServiceApplication/CounterService.WebService/CounterServiceWebService/CounterServiceWebService.csproj +++ b/Services/CounterService/src/CounterServiceApplication/CounterService.WebService/CounterServiceWebService/CounterServiceWebService.csproj @@ -15,14 +15,14 @@ - + - + diff --git a/Services/CounterService/src/CounterServiceApplication/CounterService/CounterService.csproj b/Services/CounterService/src/CounterServiceApplication/CounterService/CounterService.csproj index a9cc777..7d8e0b0 100755 --- a/Services/CounterService/src/CounterServiceApplication/CounterService/CounterService.csproj +++ b/Services/CounterService/src/CounterServiceApplication/CounterService/CounterService.csproj @@ -1,4 +1,3 @@ - @@ -10,14 +9,17 @@ CounterService $(PackageTargetFallback) + - + + - - - - - + + + + + +