Updated deps (nupkgs).

2023-02-01 16:56:14 -08:00 · 2023-02-01 16:56:14 -08:00 · 46780fde92
--- a/FHTest/FHTest.csproj
+++ b/FHTest/FHTest.csproj
@ -17,14 +17,14 @@
        <PlatformTarget>x64</PlatformTarget>
    </PropertyGroup>
    <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
-        <PackageReference Include="MSTest.TestAdapter" Version="3.0.0" />
-        <PackageReference Include="MSTest.TestFramework" Version="3.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+        <PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
+        <PackageReference Include="MSTest.TestFramework" Version="3.0.2" />
        <PackageReference Include="coverlet.collector" Version="3.2.0">
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
-		<PackageReference Include="ServiceFabric.Mocks" Version="6.1.5" />
+		<PackageReference Include="ServiceFabric.Mocks" Version="7.0.1" />
    </ItemGroup>
    <ItemGroup>
        <ProjectReference Include="..\FabricHealerProxy\FabricHealerProxy.csproj" />
--- a/FabricHealer/FabricHealer.csproj
+++ b/FabricHealer/FabricHealer.csproj
@ -31,8 +31,8 @@
 	<PackageReference Include="Microsoft.ServiceFabric.Services" Version="6.0.1017" />
    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-    <PackageReference Include="NLog" Version="5.1.0" />
-    <PackageReference Include="Octokit" Version="4.0.3" />
+    <PackageReference Include="NLog" Version="5.1.1" />
+    <PackageReference Include="Octokit" Version="5.0.0" />
    <PackageReference Include="System.Configuration.Abstractions" Version="2.0.2.45" />
    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
--- a/FabricHealer/Repair/RepairTaskEngine.cs
+++ b/FabricHealer/Repair/RepairTaskEngine.cs
@ -258,11 +258,11 @@ namespace FabricHealer.Repair
                            // then treat as any other node level repair?

                            if (repair.Executor.Contains(RepairConstants.InfrastructureServiceName) ||
-                                repair.Action.ToLower().Contains("reboot") ||
-                                repair.Action.ToLower().Contains("reimage") ||
+                                repair.Action.ToLower().Contains("azure.host") ||
                                repair.Action.ToLower().Contains("azure.heal") ||
-                                // TOTHINK: should all platform/tenant updates be treated as node-level repairs and counted at this stage?
-                                repair.Action.ToLower().Contains("azure.job"))
+                                repair.Action.ToLower().Contains("azure.job") ||
+                                repair.Action.ToLower().Contains("reboot") ||
+                                repair.Action.ToLower().Contains("reimage"))
                            {
                                return true;
                            }
@ -272,7 +272,7 @@ namespace FabricHealer.Repair
            }
            catch (Exception e) when (e is ArgumentException || e is FabricException || e is TaskCanceledException || e is TimeoutException)
            {
-
+                
            }

            return false;
@ -333,11 +333,11 @@ namespace FabricHealer.Repair
                    else if (repair.Target is NodeRepairTargetDescription target)
                    {
                        if (repair.Executor.Contains(RepairConstants.InfrastructureServiceName) ||
-                            repair.Action.ToLower().Contains("reboot") ||
-                            repair.Action.ToLower().Contains("reimage") ||
-                            repair.Action.ToLower().Contains("azure.heal") ||
-                            // TOTHINK: should all platform/tenant updates be treated as node-level repairs and counted at this stage?
-                            repair.Action.ToLower().Contains("azure.job"))
+                               repair.Action.ToLower().Contains("azure.host") ||
+                               repair.Action.ToLower().Contains("azure.heal") ||
+                               repair.Action.ToLower().Contains("azure.job") ||
+                               repair.Action.ToLower().Contains("reboot") ||
+                               repair.Action.ToLower().Contains("reimage"))
                        {
                            count++;
                        }
--- a/FabricHealerApp/FabricHealerApp.sfproj
+++ b/FabricHealerApp/FabricHealerApp.sfproj
@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" InitialTargets=";ValidateMSBuildFiles">
-  <Import Project="..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.6\build\Microsoft.VisualStudio.Azure.Fabric.Application.props" Condition="Exists('..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.6\build\Microsoft.VisualStudio.Azure.Fabric.Application.props')" />
+  <Import Project="..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.7\build\Microsoft.VisualStudio.Azure.Fabric.Application.props" Condition="Exists('..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.7\build\Microsoft.VisualStudio.Azure.Fabric.Application.props')" />
  <PropertyGroup Label="Globals">
    <ProjectGuid>a977c8e0-2183-4845-95ea-7f3c3e795310</ProjectGuid>
    <ProjectVersion>2.3</ProjectVersion>
    <MinToolsVersion>1.5</MinToolsVersion>
-    <SupportedMSBuildNuGetPackageVersion>1.7.3</SupportedMSBuildNuGetPackageVersion>
+    <SupportedMSBuildNuGetPackageVersion>1.7.6</SupportedMSBuildNuGetPackageVersion>
    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
  </PropertyGroup>
  <ItemGroup Label="ProjectConfigurations">
@ -43,9 +43,9 @@
    <ApplicationProjectTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Service Fabric Tools\Microsoft.VisualStudio.Azure.Fabric.ApplicationProject.targets</ApplicationProjectTargetsPath>
  </PropertyGroup>
  <Import Project="$(ApplicationProjectTargetsPath)" Condition="Exists('$(ApplicationProjectTargetsPath)')" />
-  <Import Project="..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.6\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.6\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets')" />
+  <Import Project="..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.7\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets" Condition="Exists('..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.7\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets')" />
  <Target Name="ValidateMSBuildFiles" BeforeTargets="PrepareForBuild">
-    <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.6\build\Microsoft.VisualStudio.Azure.Fabric.Application.props')" Text="Unable to find the '..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.6\build\Microsoft.VisualStudio.Azure.Fabric.Application.props' file. Please restore the 'Microsoft.VisualStudio.Azure.Fabric.MSBuild' Nuget package." />
-    <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.6\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets')" Text="Unable to find the '..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.6\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets' file. Please restore the 'Microsoft.VisualStudio.Azure.Fabric.MSBuild' Nuget package." />
+    <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.7\build\Microsoft.VisualStudio.Azure.Fabric.Application.props')" Text="Unable to find the '..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.7\build\Microsoft.VisualStudio.Azure.Fabric.Application.props' file. Please restore the 'Microsoft.VisualStudio.Azure.Fabric.MSBuild' Nuget package." />
+    <Error Condition="!Exists('..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.7\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets')" Text="Unable to find the '..\packages\Microsoft.VisualStudio.Azure.Fabric.MSBuild.1.7.7\build\Microsoft.VisualStudio.Azure.Fabric.Application.targets' file. Please restore the 'Microsoft.VisualStudio.Azure.Fabric.MSBuild' Nuget package." />
  </Target>
 </Project>
--- a/FabricHealerApp/packages.config
+++ b/FabricHealerApp/packages.config
@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.VisualStudio.Azure.Fabric.MSBuild" version="1.7.6" />
+  <package id="Microsoft.VisualStudio.Azure.Fabric.MSBuild" version="1.7.7" />
 </packages>
--- a/FabricHealerProxy/FabricHealerProxy.csproj
+++ b/FabricHealerProxy/FabricHealerProxy.csproj
@ -7,7 +7,7 @@
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
 		<PackageReference Include="Microsoft.ServiceFabric.Services" Version="6.0.1017" />
-		<PackageReference Include="NLog" Version="5.1.0" />
+		<PackageReference Include="NLog" Version="5.1.1" />
 		<PackageReference Include="Polly" Version="7.2.3" />
 	</ItemGroup>
 </Project>