FO 3.1.18/CO 2.1.11

microsoft · Oct 11, 2021 · ed519b4 · ed519b4
2 parents cb71f15 + 6318e61
commit ed519b4
Show file tree

Hide file tree

Showing 67 changed files with 2,143 additions and 2,058 deletions.
diff --git a/.gitignore b/.gitignore
@@ -335,4 +335,28 @@ ASALocalRun/
 **/PublishProfiles/Cloud.xml
 /FabricObserver/observer_logs
 /FabricObserver/PackageRoot/Data/Plugins/SampleNewObserver.dll
-/nuget.exe
+/nuget.exe
+/FabricObserver/PackageRoot/Data/Plugins/vcruntime140.dll
+/FabricObserver/PackageRoot/Data/Plugins/vccorlib140.dll
+/FabricObserver/PackageRoot/Data/Plugins/Tfx_x86.lib
+/FabricObserver/PackageRoot/Data/Plugins/Tfx_x86.dll
+/FabricObserver/PackageRoot/Data/Plugins/TfxPerfCounter.man
+/FabricObserver/PackageRoot/Data/Plugins/Tfx.lib
+/FabricObserver/PackageRoot/Data/Plugins/Tfx.dll
+/FabricObserver/PackageRoot/Data/Plugins/msvcp140.dll
+/FabricObserver/PackageRoot/Data/Plugins/Microsoft.Cloud.InstrumentationFramework.Metrics.dll
+/FabricObserver/PackageRoot/Data/Plugins/IfxMetrics_x86.lib
+/FabricObserver/PackageRoot/Data/Plugins/IfxMetrics_x86.dll
+/FabricObserver/PackageRoot/Data/Plugins/IfxMetrics.lib
+/FabricObserver/PackageRoot/Data/Plugins/IfxMetrics.dll
+/FabricObserver/PackageRoot/Data/Plugins/IfxHealth_x86.lib
+/FabricObserver/PackageRoot/Data/Plugins/IfxHealth_x86.dll
+/FabricObserver/PackageRoot/Data/Plugins/IfxHealth.lib
+/FabricObserver/PackageRoot/Data/Plugins/IfxHealth.dll
+/FabricObserver/PackageRoot/Data/Plugins/IfxEvents_x86.lib
+/FabricObserver/PackageRoot/Data/Plugins/IfxEvents_x86.dll
+/FabricObserver/PackageRoot/Data/Plugins/IfxEvents.lib
+/FabricObserver/PackageRoot/Data/Plugins/IfxEvents.dll
+/FabricObserver/PackageRoot/Data/Plugins/FabricObserverMdm.dll
+/FabricObserver/PackageRoot/Data/Plugins/concrt140.dll
+/FabricObserverApp/ApplicationPackageRoot/ApplicationManifest_MDM.xml
diff --git a/Build-COSFPkgs.ps1 b/Build-COSFPkgs.ps1
@@ -23,11 +23,11 @@ function Build-SFPkg {
 try {
     Push-Location $scriptPath
 
-    Build-SFPkg "Microsoft.ServiceFabricApps.ClusterObserver.Linux.SelfContained.2.1.10" "$scriptPath\bin\release\ClusterObserver\linux-x64\self-contained\ClusterObserverType"
-    Build-SFPkg "Microsoft.ServiceFabricApps.ClusterObserver.Linux.FrameworkDependent.2.1.10" "$scriptPath\bin\release\ClusterObserver\linux-x64\framework-dependent\ClusterObserverType"
+    Build-SFPkg "Microsoft.ServiceFabricApps.ClusterObserver.Linux.SelfContained.2.1.11" "$scriptPath\bin\release\ClusterObserver\linux-x64\self-contained\ClusterObserverType"
+    Build-SFPkg "Microsoft.ServiceFabricApps.ClusterObserver.Linux.FrameworkDependent.2.1.11" "$scriptPath\bin\release\ClusterObserver\linux-x64\framework-dependent\ClusterObserverType"
 
-    Build-SFPkg "Microsoft.ServiceFabricApps.ClusterObserver.Windows.SelfContained.2.1.10" "$scriptPath\bin\release\ClusterObserver\win-x64\self-contained\ClusterObserverType"
-    Build-SFPkg "Microsoft.ServiceFabricApps.ClusterObserver.Windows.FrameworkDependent.2.1.10" "$scriptPath\bin\release\ClusterObserver\win-x64\framework-dependent\ClusterObserverType"
+    Build-SFPkg "Microsoft.ServiceFabricApps.ClusterObserver.Windows.SelfContained.2.1.11" "$scriptPath\bin\release\ClusterObserver\win-x64\self-contained\ClusterObserverType"
+    Build-SFPkg "Microsoft.ServiceFabricApps.ClusterObserver.Windows.FrameworkDependent.2.1.11" "$scriptPath\bin\release\ClusterObserver\win-x64\framework-dependent\ClusterObserverType"
 }
 finally {
     Pop-Location

diff --git a/Build-FabricObserver.ps1 b/Build-FabricObserver.ps1
@@ -26,7 +26,7 @@ function Update-ApplicationManifestForLinux {
 
             $NewFileContent += $newNode
         }
-        elseif ($FileContent[$i] -like "*</ApplicationManifest>*") {
+        elseif ($FileContent[$i] -like "*<Certificates>*") {
 
             $NewFileContent += $newNode2
         }

diff --git a/Build-SFPkgs.ps1 b/Build-SFPkgs.ps1
@@ -23,11 +23,11 @@ function Build-SFPkg {
 try {
     Push-Location $scriptPath
 
-    Build-SFPkg "Microsoft.ServiceFabricApps.FabricObserver.Linux.SelfContained.3.1.17" "$scriptPath\bin\release\FabricObserver\linux-x64\self-contained\FabricObserverType"
-    Build-SFPkg "Microsoft.ServiceFabricApps.FabricObserver.Linux.FrameworkDependent.3.1.17" "$scriptPath\bin\release\FabricObserver\linux-x64\framework-dependent\FabricObserverType"
+    Build-SFPkg "Microsoft.ServiceFabricApps.FabricObserver.Linux.SelfContained.3.1.18" "$scriptPath\bin\release\FabricObserver\linux-x64\self-contained\FabricObserverType"
+    Build-SFPkg "Microsoft.ServiceFabricApps.FabricObserver.Linux.FrameworkDependent.3.1.18" "$scriptPath\bin\release\FabricObserver\linux-x64\framework-dependent\FabricObserverType"
 
-    Build-SFPkg "Microsoft.ServiceFabricApps.FabricObserver.Windows.SelfContained.3.1.17" "$scriptPath\bin\release\FabricObserver\win-x64\self-contained\FabricObserverType"
-    Build-SFPkg "Microsoft.ServiceFabricApps.FabricObserver.Windows.FrameworkDependent.3.1.17" "$scriptPath\bin\release\FabricObserver\win-x64\framework-dependent\FabricObserverType"
+    Build-SFPkg "Microsoft.ServiceFabricApps.FabricObserver.Windows.SelfContained.3.1.18" "$scriptPath\bin\release\FabricObserver\win-x64\self-contained\FabricObserverType"
+    Build-SFPkg "Microsoft.ServiceFabricApps.FabricObserver.Windows.FrameworkDependent.3.1.18" "$scriptPath\bin\release\FabricObserver\win-x64\framework-dependent\FabricObserverType"
 }
 finally {
     Pop-Location

diff --git a/ClusterObserver.nuspec.template b/ClusterObserver.nuspec.template
@@ -2,10 +2,8 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="3.3.0">
     <id>%PACKAGE_ID%</id>
-    <version>2.1.10</version>
-    <releaseNotes>
-      Updated TelemetryData and ApplicationInsights impl to match FO 3.1.15's impls.
-    </releaseNotes>
+    <version>2.1.11</version>
+    <releaseNotes>Bug fixes.</releaseNotes>
     <authors>Microsoft</authors>
     <license type="expression">MIT</license>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>