Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Charles Torre committed Mar 7, 2023
2 parents 35f29ce + caefe16 commit eabd355
Show file tree
Hide file tree
Showing 4 changed files with 886 additions and 883 deletions.
84 changes: 42 additions & 42 deletions FabricObserver.Extensibility.nuspec.template
Original file line number Diff line number Diff line change
@@ -1,42 +1,42 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="3.3.0">
<id>%PACKAGE_ID%</id>
<version>3.2.5</version>
<releaseNotes>
</releaseNotes>
<authors>Microsoft</authors>
<license type="expression">MIT</license>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<title>Service Fabric FabricObserver Extensibility Library</title>
<icon>icon.png</icon>
<readme>foextlib.md</readme>
<language>en-US</language>
<description>This package contains the FabricObserver Extensibility library for use in building FabricObserver and ClusterObserver plugins. NOTE: This version targets .NET 6.</description>
<contentFiles>
<files include="**" buildAction="None" copyToOutput="true" />
</contentFiles>
<dependencies>
<group targetFramework="net6.0">
<dependency id="Microsoft.ServiceFabric.Services" version="6.0.1017" />
<dependency id="Microsoft.ApplicationInsights" version="2.21.0" />
<dependency id="Microsoft.ApplicationInsights.NLogTarget" version="2.21.0" />
<dependency id="Microsoft.Extensions.DependencyInjection" version="7.0.0" />
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="7.0.0" />
<dependency id="Newtonsoft.Json" version="13.0.2" />
<dependency id="NLog" version="5.1.0" />
<dependency id="System.Diagnostics.PerformanceCounter" version="7.0.0" />
<dependency id="System.Management" version="7.0.0" />
</group>
</dependencies>
<projectUrl>https://aka.ms/sf/FabricObserver</projectUrl>
<tags>azure service-fabric fabric-observer utility watchdog-service observability</tags>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
</metadata>
<files>
<file src="FabricObserverPkg\Code\FabricObserver.Extensibility.dll" target="lib\net6.0" />
<file src="FabricObserverPkg\Code\TelemetryLib.dll" target="lib\net6.0" />
<file src="%ROOT_PATH%\icon.png" target="" />
<file src="%ROOT_PATH%\foextlib.md" target="" />
</files>
</package>
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="3.3.0">
<id>%PACKAGE_ID%</id>
<version>3.2.5</version>
<releaseNotes>
</releaseNotes>
<authors>Microsoft</authors>
<license type="expression">MIT</license>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<title>Service Fabric FabricObserver Extensibility Library</title>
<icon>icon.png</icon>
<readme>foextlib.md</readme>
<language>en-US</language>
<description>This package contains the FabricObserver Extensibility library (.NET 6) for use in building FabricObserver and ClusterObserver plugins. NOTE: This is no longer a .NET Standard 2.0 library.</description>
<contentFiles>
<files include="**" buildAction="None" copyToOutput="true" />
</contentFiles>
<dependencies>
<group targetFramework="net6.0">
<dependency id="Microsoft.ServiceFabric.Services" version="6.0.1017" />
<dependency id="Microsoft.ApplicationInsights" version="2.21.0" />
<dependency id="Microsoft.ApplicationInsights.NLogTarget" version="2.21.0" />
<dependency id="Microsoft.Extensions.DependencyInjection" version="7.0.0" />
<dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="7.0.0" />
<dependency id="Newtonsoft.Json" version="13.0.2" />
<dependency id="NLog" version="5.1.0" />
<dependency id="System.Diagnostics.PerformanceCounter" version="7.0.0" />
<dependency id="System.Management" version="7.0.0" />
</group>
</dependencies>
<projectUrl>https://aka.ms/sf/FabricObserver</projectUrl>
<tags>azure service-fabric fabric-observer utility watchdog-service observability</tags>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
</metadata>
<files>
<file src="FabricObserverPkg\Code\FabricObserver.Extensibility.dll" target="lib\net6.0" />
<file src="FabricObserverPkg\Code\TelemetryLib.dll" target="lib\net6.0" />
<file src="%ROOT_PATH%\icon.png" target="" />
<file src="%ROOT_PATH%\foextlib.md" target="" />
</files>
</package>
82 changes: 41 additions & 41 deletions FabricObserver.nuspec.template
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="3.3.0">
<id>%PACKAGE_ID%</id>
<version>3.2.5</version>
<releaseNotes>
- New telemetry data types: NodeTelemetryData, ServiceTelemetryData, DiskTelemetryData. These types hold only the relevant information for the target entity. For backwards compatibility, TelemetryData type still exists.
- FabricObserver is now only shipped as a .NET 6 application. There is no longer support for .NET Core 3.1.
- FabricObserver targets the Service Fabric 9.x runtime and SF SDK versions 6.0.1017 and later. There are no longer multiple releases of FO that target different SF runtime/.NET versions.
- NodeObserver can be configured to emit Node snapshots (only useful if you employ ApplicationInsights/LogAnalytics/ETW).
- Bug fixes and code improvements.
</releaseNotes>
<authors>Microsoft</authors>
<license type="expression">MIT</license>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<title>Service Fabric FabricObserver Application</title>
<icon>icon.png</icon>
<readme>fonuget.md</readme>
<language>en-US</language>
<description>This package contains the FabricObserver(FO) Application - built for .NET 6.0 and SF Runtime 9.x. FO a highly configurable and extensible resource usage watchdog service that is designed to be run in Azure Service Fabric Windows and Linux clusters. This package contains the entire application and can be used to build .NET Standard 2.0 observer plugins. NOTE: If you want to target .NET 6 for your plugins, then you must use Microsoft.ServiceFabricApps.FabricObserver.Extensibility.3.2.5 nuget package to build them.</description>
<contentFiles>
<files include="**" buildAction="None" copyToOutput="true" />
</contentFiles>
<dependencies>
<group targetFramework="net6.0">
<dependency id="Microsoft.ServiceFabric.Services" version="6.0.1017" />
</group>
</dependencies>
<projectUrl>https://aka.ms/sf/FabricObserver</projectUrl>
<tags>azure service-fabric fabric-observer utility watchdog-service observability</tags>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
</metadata>
<files>
<file src="**" target="contentFiles\any\any" />
<file src="FabricObserverPkg\Code\FabricObserver.dll" target="lib\net6.0" />
<file src="FabricObserverPkg\Code\FabricObserver.Extensibility.dll" target="lib\net6.0" />
<file src="FabricObserverPkg\Code\TelemetryLib.dll" target="lib\net6.0" />
<file src="%ROOT_PATH%\icon.png" target="" />
<file src="%ROOT_PATH%\fonuget.md" target="" />
</files>
</package>
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="3.3.0">
<id>%PACKAGE_ID%</id>
<version>3.2.5</version>
<releaseNotes>
- New telemetry data types: NodeTelemetryData, ServiceTelemetryData, DiskTelemetryData. These types hold only the relevant information for the target entity. For backwards compatibility, TelemetryData type still exists.
- FabricObserver is now only shipped as a .NET 6 application. There is no longer support for .NET Core 3.1.
- FabricObserver targets the Service Fabric 9.x runtime and SF SDK versions 6.0.1017 and later. *This version will not run on earlier versions of the SF runtime.* There are no longer multiple releases of FO that target different SF runtime/.NET versions.
- NodeObserver can be configured to emit Node snapshots (only useful if you employ ApplicationInsights/LogAnalytics/ETW).
- Bug fixes and several code improvements.
</releaseNotes>
<authors>Microsoft</authors>
<license type="expression">MIT</license>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<title>Service Fabric FabricObserver Application</title>
<icon>icon.png</icon>
<readme>fonuget.md</readme>
<language>en-US</language>
<description>This package contains the FabricObserver(FO) Application - built for .NET 6.0 and SF Runtime 9.x. FO a highly configurable and extensible resource usage watchdog service that is designed to be run in Azure Service Fabric Windows and Linux clusters. This package contains the entire application and can be used to build .NET Standard 2.0 observer plugins. NOTE: If you want to target .NET 6 for your plugins, then you must use Microsoft.ServiceFabricApps.FabricObserver.Extensibility.3.2.5 nuget package to build them.</description>
<contentFiles>
<files include="**" buildAction="None" copyToOutput="true" />
</contentFiles>
<dependencies>
<group targetFramework="net6.0">
<dependency id="Microsoft.ServiceFabric.Services" version="6.0.1017" />
</group>
</dependencies>
<projectUrl>https://aka.ms/sf/FabricObserver</projectUrl>
<tags>azure service-fabric fabric-observer utility watchdog-service observability</tags>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
</metadata>
<files>
<file src="**" target="contentFiles\any\any" />
<file src="FabricObserverPkg\Code\FabricObserver.dll" target="lib\net6.0" />
<file src="FabricObserverPkg\Code\FabricObserver.Extensibility.dll" target="lib\net6.0" />
<file src="FabricObserverPkg\Code\TelemetryLib.dll" target="lib\net6.0" />
<file src="%ROOT_PATH%\icon.png" target="" />
<file src="%ROOT_PATH%\fonuget.md" target="" />
</files>
</package>
Loading

0 comments on commit eabd355

Please sign in to comment.