From 9916ecc318ba289db4f094a133b487fa0522c8a9 Mon Sep 17 00:00:00 2001 From: Neil <49037171+neilr81@users.noreply.github.com> Date: Wed, 17 Jan 2024 14:27:00 +0000 Subject: [PATCH 01/22] Removing NetStandard support for OMEX --- Directory.Build.props | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 0a6bec8b..03835ac0 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -8,8 +8,7 @@ net8.0 $(LatestSupportedDotNetVersion) $(LatestSupportedDotNetVersion);$(OldestSupportedDotNetVersion) - netstandard2.0 - $(NetCoreVersions);$(NetStandardVersions) + $(NetCoreVersions) $(NetCoreVersions) From aaae1e11dc998c5a185a8c6d3d2ee6182a5f6875 Mon Sep 17 00:00:00 2001 From: Neil <49037171+neilr81@users.noreply.github.com> Date: Wed, 17 Jan 2024 14:28:27 +0000 Subject: [PATCH 02/22] Update Microsoft.Omex.Extensions.Diagnostics.HealthChecks.UnitTests.csproj --- ...t.Omex.Extensions.Diagnostics.HealthChecks.UnitTests.csproj | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/Diagnostics.HealthChecks.UnitTests/Microsoft.Omex.Extensions.Diagnostics.HealthChecks.UnitTests.csproj b/tests/Diagnostics.HealthChecks.UnitTests/Microsoft.Omex.Extensions.Diagnostics.HealthChecks.UnitTests.csproj index 1f9ec2c3..9e6e9454 100644 --- a/tests/Diagnostics.HealthChecks.UnitTests/Microsoft.Omex.Extensions.Diagnostics.HealthChecks.UnitTests.csproj +++ b/tests/Diagnostics.HealthChecks.UnitTests/Microsoft.Omex.Extensions.Diagnostics.HealthChecks.UnitTests.csproj @@ -9,7 +9,4 @@ - - - From 3e42e8a8d9ab8fe9a67631338618e13c9a3c820e Mon Sep 17 00:00:00 2001 From: Neil <49037171+neilr81@users.noreply.github.com> Date: Wed, 17 Jan 2024 14:28:55 +0000 Subject: [PATCH 03/22] Update Microsoft.Omex.Extensions.ServiceFabricGuest.Abstractions.UnitTests.csproj --- ...Extensions.ServiceFabricGuest.Abstractions.UnitTests.csproj | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/ServiceFabricGuest.Abstractions.UnitTests/Microsoft.Omex.Extensions.ServiceFabricGuest.Abstractions.UnitTests.csproj b/tests/ServiceFabricGuest.Abstractions.UnitTests/Microsoft.Omex.Extensions.ServiceFabricGuest.Abstractions.UnitTests.csproj index 3dda320e..c288d2f5 100644 --- a/tests/ServiceFabricGuest.Abstractions.UnitTests/Microsoft.Omex.Extensions.ServiceFabricGuest.Abstractions.UnitTests.csproj +++ b/tests/ServiceFabricGuest.Abstractions.UnitTests/Microsoft.Omex.Extensions.ServiceFabricGuest.Abstractions.UnitTests.csproj @@ -15,7 +15,4 @@ - - - From 453370ac9f1b666db8c469388c38b9f22101b8b0 Mon Sep 17 00:00:00 2001 From: Neil <49037171+neilr81@users.noreply.github.com> Date: Wed, 17 Jan 2024 16:57:56 +0000 Subject: [PATCH 04/22] Delete src/Abstractions/NetStandardCompatability.cs --- src/Abstractions/NetStandardCompatability.cs | 37 -------------------- 1 file changed, 37 deletions(-) delete mode 100644 src/Abstractions/NetStandardCompatability.cs diff --git a/src/Abstractions/NetStandardCompatability.cs b/src/Abstractions/NetStandardCompatability.cs deleted file mode 100644 index 94c2eec2..00000000 --- a/src/Abstractions/NetStandardCompatability.cs +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT license. - -#if NETSTANDARD2_0 || NETFRAMEWORK // This marker attribute only available starting from netstandard 2.1, so we need a replacement to build for full framework -namespace System.Diagnostics.CodeAnalysis -{ - /// - /// Specifies that when a method returns , the parameter will not be null even if the corresponding type allows it. - /// - [AttributeUsage(AttributeTargets.Parameter, Inherited = false)] - public sealed class NotNullWhenAttribute : Attribute - { - /// - /// Initializes the attribute with the specified return value condition - /// - /// - /// The return value condition. If the method returns this value, the associated parameter will not be null - /// - public NotNullWhenAttribute(bool returnValue) => ReturnValue = returnValue; - - /// - /// Gets the return value condition - /// - public bool ReturnValue { get; } - } -} -#endif - -#if !NET5_0_OR_GREATER -namespace System.Runtime.CompilerServices -{ - /// - /// Stub to allow using record and init properties when building for older targets - /// - public static class IsExternalInit { } -} -#endif From 3905f0c79c212b8ded3d2001fae9ec85e8726022 Mon Sep 17 00:00:00 2001 From: Neil <49037171+neilr81@users.noreply.github.com> Date: Wed, 17 Jan 2024 17:00:25 +0000 Subject: [PATCH 05/22] Update NullableAssert.cs --- src/Testing.Helpers/NullableAssert.cs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/Testing.Helpers/NullableAssert.cs b/src/Testing.Helpers/NullableAssert.cs index 03d67d15..fd3cf701 100644 --- a/src/Testing.Helpers/NullableAssert.cs +++ b/src/Testing.Helpers/NullableAssert.cs @@ -11,14 +11,6 @@ namespace Microsoft.Omex.Extensions.Testing.Helpers /// public static class NullableAssert { - /// - /// Tests whether the specified object is non-null and throws an exception if it is null - /// - public static void IsNotNull([NotNull] object? value, string message = "", params object[] parameters) => -#pragma warning disable CS8777 // Assert.IsNotNull would throw if object is null - Assert.IsNotNull(value, message, parameters); -#pragma warning restore CS8777 - /// /// Tests whether the specified condition is true and throws an exception if the condition is false. /// From a1b95d77f393bf566f72b290d75b855865e8fde8 Mon Sep 17 00:00:00 2001 From: Neil <49037171+neilr81@users.noreply.github.com> Date: Wed, 17 Jan 2024 17:01:48 +0000 Subject: [PATCH 06/22] Update HttpEndpointHealthCheck.cs --- .../Internal/HttpEndpointHealthCheck.cs | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/Diagnostics.HealthChecks/Internal/HttpEndpointHealthCheck.cs b/src/Diagnostics.HealthChecks/Internal/HttpEndpointHealthCheck.cs index f8298aba..651920e3 100644 --- a/src/Diagnostics.HealthChecks/Internal/HttpEndpointHealthCheck.cs +++ b/src/Diagnostics.HealthChecks/Internal/HttpEndpointHealthCheck.cs @@ -82,19 +82,12 @@ private static HttpRequestMessage CloneRequestMessage(HttpRequestMessage message clone.Headers.TryAddWithoutValidation(header.Key, header.Value); } -#if !NETCOREAPP3_1 && !NETSTANDARD2_0 clone.VersionPolicy = message.VersionPolicy; foreach (KeyValuePair option in message.Options) { clone.Options.Set(new HttpRequestOptionsKey(option.Key), option.Value); } -#else - foreach (KeyValuePair prop in message.Properties) - { - clone.Properties.Add(prop.Key, prop.Value); - } -#endif return clone; } From e67372174e2d383b464c58e4be83930ded84cdfa Mon Sep 17 00:00:00 2001 From: Neil <49037171+neilr81@users.noreply.github.com> Date: Wed, 17 Jan 2024 17:02:41 +0000 Subject: [PATCH 07/22] Update Validation.cs --- src/Abstractions/Validation.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Abstractions/Validation.cs b/src/Abstractions/Validation.cs index a3181b30..e40f8a63 100644 --- a/src/Abstractions/Validation.cs +++ b/src/Abstractions/Validation.cs @@ -23,7 +23,7 @@ public static string ThrowIfNullOrWhiteSpace(string? value, string? name = null) { if (!string.IsNullOrWhiteSpace(value)) { - return value!; // `!` required because in netstandard2.0 IsNullOrWhiteSpace does not have proper attributes + return value; } _ = value ?? throw new ArgumentNullException(name); From a049eaf1e49954791723ef30848595448f466493 Mon Sep 17 00:00:00 2001 From: Neil <49037171+neilr81@users.noreply.github.com> Date: Wed, 17 Jan 2024 22:21:33 +0000 Subject: [PATCH 08/22] Update NullableAssert.cs --- src/Testing.Helpers/NullableAssert.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/Testing.Helpers/NullableAssert.cs b/src/Testing.Helpers/NullableAssert.cs index fd3cf701..03d67d15 100644 --- a/src/Testing.Helpers/NullableAssert.cs +++ b/src/Testing.Helpers/NullableAssert.cs @@ -11,6 +11,14 @@ namespace Microsoft.Omex.Extensions.Testing.Helpers /// public static class NullableAssert { + /// + /// Tests whether the specified object is non-null and throws an exception if it is null + /// + public static void IsNotNull([NotNull] object? value, string message = "", params object[] parameters) => +#pragma warning disable CS8777 // Assert.IsNotNull would throw if object is null + Assert.IsNotNull(value, message, parameters); +#pragma warning restore CS8777 + /// /// Tests whether the specified condition is true and throws an exception if the condition is false. /// From 65983340c530123118811385e76aff1f03ea4bdb Mon Sep 17 00:00:00 2001 From: Neil Richardson Date: Wed, 17 Jan 2024 22:35:43 +0000 Subject: [PATCH 09/22] Fixing typo --- src/Activities/Internal/ActivityLoggerHelpers.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Activities/Internal/ActivityLoggerHelpers.cs b/src/Activities/Internal/ActivityLoggerHelpers.cs index 109ef328..a43e8d39 100644 --- a/src/Activities/Internal/ActivityLoggerHelpers.cs +++ b/src/Activities/Internal/ActivityLoggerHelpers.cs @@ -22,7 +22,7 @@ public static StringBuilder AppendParamName(this StringBuilder builder, string n builder.Append(name).Append(':'); /// - /// Appends collection of key value pairs to StringBuilder, by calling ToSting on key and value + /// Appends collection of key value pairs to StringBuilder, by calling ToString on key and value /// /// /// TODO: should be replaced by AppendJoin when we remove netstandard target, since KeyValuePair also overrides ToString From abac3301a929c611a62f95762db46e9e94f09416 Mon Sep 17 00:00:00 2001 From: Neil Richardson Date: Wed, 31 Jan 2024 13:34:13 +0000 Subject: [PATCH 10/22] Remove netstandard and framework build references --- Directory.Build.props | 6 ------ .../Microsoft.Omex.Extensions.Abstractions.csproj | 3 --- ...icrosoft.Omex.Extensions.Diagnostics.HealthChecks.csproj | 3 --- 3 files changed, 12 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 03835ac0..71586b7f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -26,12 +26,6 @@ latest enable - - $(NetStandardVersions.Contains('$(TargetFramework)')) - $(NetCoreVersions.Contains('$(TargetFramework)')) - false - true - true false diff --git a/src/Abstractions/Microsoft.Omex.Extensions.Abstractions.csproj b/src/Abstractions/Microsoft.Omex.Extensions.Abstractions.csproj index ec9b9340..8a8d4474 100644 --- a/src/Abstractions/Microsoft.Omex.Extensions.Abstractions.csproj +++ b/src/Abstractions/Microsoft.Omex.Extensions.Abstractions.csproj @@ -18,7 +18,4 @@ - - - diff --git a/src/Diagnostics.HealthChecks/Microsoft.Omex.Extensions.Diagnostics.HealthChecks.csproj b/src/Diagnostics.HealthChecks/Microsoft.Omex.Extensions.Diagnostics.HealthChecks.csproj index dc15837f..0b14c788 100644 --- a/src/Diagnostics.HealthChecks/Microsoft.Omex.Extensions.Diagnostics.HealthChecks.csproj +++ b/src/Diagnostics.HealthChecks/Microsoft.Omex.Extensions.Diagnostics.HealthChecks.csproj @@ -17,9 +17,6 @@ - - - From 303107ccedff3084baa7868272c12e465bbecf52 Mon Sep 17 00:00:00 2001 From: Neil Richardson Date: Wed, 31 Jan 2024 17:24:15 +0000 Subject: [PATCH 11/22] Updating to use AppendJoin --- src/Activities/Internal/ActivityObserver.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Activities/Internal/ActivityObserver.cs b/src/Activities/Internal/ActivityObserver.cs index 8550c48f..318c66de 100644 --- a/src/Activities/Internal/ActivityObserver.cs +++ b/src/Activities/Internal/ActivityObserver.cs @@ -53,8 +53,8 @@ public void OnStop(Activity activity, object? payload = null) .AppendObjStart() .AppendParamName("Id").Append(activity.Id).AppendSeparator() .AppendParamName("Duration").Append(activity.Duration.TotalMilliseconds).AppendSeparator() - .AppendParamName("Baggage").AppendPairs(activity.Baggage).AppendSeparator() - .AppendParamName("Tags").AppendPairs(activity.TagObjects).AppendSeparator() + .AppendParamName("Baggage").AppendJoin(':', activity.Baggage).AppendSeparator() + .AppendParamName("Tags").AppendJoin(':', activity.TagObjects).AppendSeparator() .AppendObjEnd() .ToString(); From 97edd72202d95a5d0a2d0fe0fedb4424d3503b9d Mon Sep 17 00:00:00 2001 From: Neil Richardson Date: Wed, 31 Jan 2024 17:25:56 +0000 Subject: [PATCH 12/22] Removing unused function --- .../Internal/ActivityLoggerHelpers.cs | 30 ------------------- 1 file changed, 30 deletions(-) diff --git a/src/Activities/Internal/ActivityLoggerHelpers.cs b/src/Activities/Internal/ActivityLoggerHelpers.cs index a43e8d39..33234373 100644 --- a/src/Activities/Internal/ActivityLoggerHelpers.cs +++ b/src/Activities/Internal/ActivityLoggerHelpers.cs @@ -20,35 +20,5 @@ internal static class ActivityLoggerHelpers public static StringBuilder AppendParamName(this StringBuilder builder, string name) => builder.Append(name).Append(':'); - - /// - /// Appends collection of key value pairs to StringBuilder, by calling ToString on key and value - /// - /// - /// TODO: should be replaced by AppendJoin when we remove netstandard target, since KeyValuePair also overrides ToString - /// - public static StringBuilder AppendPairs(this StringBuilder builder, IEnumerable> pairs) - { - builder.AppendArrayStart(); - - bool isFirst = true; - foreach (KeyValuePair pair in pairs) - { - if (!isFirst) - { - builder.AppendSeparator(); - } - - builder - .AppendObjStart() - .AppendParamName(pair.Key) - .Append(pair.Value) - .AppendObjEnd(); - } - - builder.AppendArrayEnd(); - - return builder; - } } } From 2e48fbea305a874c9556e004df23d84267102445 Mon Sep 17 00:00:00 2001 From: Neil <49037171+neilr81@users.noreply.github.com> Date: Thu, 1 Feb 2024 14:16:28 +0000 Subject: [PATCH 13/22] Test removal of SF step --- .github/workflows/build.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 886fb7c3..57f4fdf6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,14 +27,6 @@ jobs: - uses: actions/setup-dotnet@v4 with: dotnet-version: '8.0.x' - # Install SF SDK - - name: Install SF - shell: pwsh - run: | - Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Force -Scope CurrentUser - $ProgressPreference = 'SilentlyContinue' - Invoke-WebRequest -OutFile setup.exe -Uri https://download.microsoft.com/download/b/8/a/b8a2fb98-0ec1-41e5-be98-9d8b5abf7856/MicrosoftServiceFabric.10.0.1816.9590.exe - .\setup.exe /accepteula /force /quiet - name: Build with dotnet run: dotnet build --configuration ${{ matrix.configuration }} - name: Run Unit Tests From 267f5fbbcb7e395ee7a036995c66f0fb4489253a Mon Sep 17 00:00:00 2001 From: Neil <49037171+neilr81@users.noreply.github.com> Date: Thu, 1 Feb 2024 16:58:52 +0000 Subject: [PATCH 14/22] Update build.yml --- .github/workflows/build.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 57f4fdf6..9d16df19 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,6 +27,14 @@ jobs: - uses: actions/setup-dotnet@v4 with: dotnet-version: '8.0.x' + # Install SF SDK + - name: Install SF + shell: pwsh + run: | + Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Force -Scope CurrentUser + $ProgressPreference = 'SilentlyContinue' + Invoke-WebRequest -OutFile setup.exe -Uri https://download.microsoft.com/download/b/8/a/b8a2fb98-0ec1-41e5-be98-9d8b5abf7856/MicrosoftServiceFabric.10.0.1816.9590.exe + .\setup.exe /accepteula /force /quiet - name: Build with dotnet run: dotnet build --configuration ${{ matrix.configuration }} - name: Run Unit Tests From 15dec40e84f066e40dbf312da9b675f9882d47ce Mon Sep 17 00:00:00 2001 From: Neil <49037171+neilr81@users.noreply.github.com> Date: Thu, 1 Feb 2024 17:01:33 +0000 Subject: [PATCH 15/22] Update build.yml --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9d16df19..374d4270 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,8 @@ jobs: # Install SF SDK - name: Install SF shell: pwsh - run: | + run: | + Import-Module Microsoft.PowerShell.Security -AllowClobber -Force Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Force -Scope CurrentUser $ProgressPreference = 'SilentlyContinue' Invoke-WebRequest -OutFile setup.exe -Uri https://download.microsoft.com/download/b/8/a/b8a2fb98-0ec1-41e5-be98-9d8b5abf7856/MicrosoftServiceFabric.10.0.1816.9590.exe From 644cacdfb3f9972d78d0c08f92f710fd1f1e5f4e Mon Sep 17 00:00:00 2001 From: Neil <49037171+neilr81@users.noreply.github.com> Date: Thu, 1 Feb 2024 17:02:17 +0000 Subject: [PATCH 16/22] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 374d4270..472b4872 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: - name: Install SF shell: pwsh run: | - Import-Module Microsoft.PowerShell.Security -AllowClobber -Force + Import-Module Microsoft.PowerShell.Security -NoClobber -Force Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Force -Scope CurrentUser $ProgressPreference = 'SilentlyContinue' Invoke-WebRequest -OutFile setup.exe -Uri https://download.microsoft.com/download/b/8/a/b8a2fb98-0ec1-41e5-be98-9d8b5abf7856/MicrosoftServiceFabric.10.0.1816.9590.exe From 1c8baa4431562e28b7243bd086981bcf3a4a8080 Mon Sep 17 00:00:00 2001 From: Neil <49037171+neilr81@users.noreply.github.com> Date: Thu, 1 Feb 2024 17:09:46 +0000 Subject: [PATCH 17/22] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 472b4872..82daaf72 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: - name: Install SF shell: pwsh run: | - Import-Module Microsoft.PowerShell.Security -NoClobber -Force + Import-Module Microsoft.PowerShell.Security -Force Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Force -Scope CurrentUser $ProgressPreference = 'SilentlyContinue' Invoke-WebRequest -OutFile setup.exe -Uri https://download.microsoft.com/download/b/8/a/b8a2fb98-0ec1-41e5-be98-9d8b5abf7856/MicrosoftServiceFabric.10.0.1816.9590.exe From 593c2d44ac3fb726580d9948739cd226ffd09b7d Mon Sep 17 00:00:00 2001 From: Neil <49037171+neilr81@users.noreply.github.com> Date: Thu, 1 Feb 2024 17:25:19 +0000 Subject: [PATCH 18/22] Update build.yml --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 82daaf72..db9dc1c6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,8 +31,6 @@ jobs: - name: Install SF shell: pwsh run: | - Import-Module Microsoft.PowerShell.Security -Force - Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Force -Scope CurrentUser $ProgressPreference = 'SilentlyContinue' Invoke-WebRequest -OutFile setup.exe -Uri https://download.microsoft.com/download/b/8/a/b8a2fb98-0ec1-41e5-be98-9d8b5abf7856/MicrosoftServiceFabric.10.0.1816.9590.exe .\setup.exe /accepteula /force /quiet From bf9a8753a2568bc0b6e3bf8ef47e3f9e748a02b9 Mon Sep 17 00:00:00 2001 From: Neil <49037171+neilr81@users.noreply.github.com> Date: Thu, 1 Feb 2024 17:41:27 +0000 Subject: [PATCH 19/22] Update build.yml --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index db9dc1c6..47b96851 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,6 +31,8 @@ jobs: - name: Install SF shell: pwsh run: | + Write-Host "test-123" + Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Force -Scope CurrentUser $ProgressPreference = 'SilentlyContinue' Invoke-WebRequest -OutFile setup.exe -Uri https://download.microsoft.com/download/b/8/a/b8a2fb98-0ec1-41e5-be98-9d8b5abf7856/MicrosoftServiceFabric.10.0.1816.9590.exe .\setup.exe /accepteula /force /quiet From 2fa98f475686cd6ab059ac05a2ec1122af4c5774 Mon Sep 17 00:00:00 2001 From: Neil <49037171+neilr81@users.noreply.github.com> Date: Fri, 2 Feb 2024 09:57:00 +0000 Subject: [PATCH 20/22] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 47b96851..4d8eca95 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: dotnet-version: '8.0.x' # Install SF SDK - name: Install SF - shell: pwsh + shell: powershell.exe run: | Write-Host "test-123" Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Force -Scope CurrentUser From 2e747e91ca5d2d184fa4aa25af4b0e3268ac05e2 Mon Sep 17 00:00:00 2001 From: Neil <49037171+neilr81@users.noreply.github.com> Date: Fri, 2 Feb 2024 09:58:27 +0000 Subject: [PATCH 21/22] Update build.yml --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4d8eca95..f8315a83 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: dotnet-version: '8.0.x' # Install SF SDK - name: Install SF - shell: powershell.exe + shell: powershell run: | Write-Host "test-123" Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Force -Scope CurrentUser From 1ce1572eb4760d76e8a8613674d964d45824880f Mon Sep 17 00:00:00 2001 From: Neil <49037171+neilr81@users.noreply.github.com> Date: Fri, 2 Feb 2024 10:02:24 +0000 Subject: [PATCH 22/22] Update build.yml --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f8315a83..5883eb97 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,8 +30,7 @@ jobs: # Install SF SDK - name: Install SF shell: powershell - run: | - Write-Host "test-123" + run: | Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Force -Scope CurrentUser $ProgressPreference = 'SilentlyContinue' Invoke-WebRequest -OutFile setup.exe -Uri https://download.microsoft.com/download/b/8/a/b8a2fb98-0ec1-41e5-be98-9d8b5abf7856/MicrosoftServiceFabric.10.0.1816.9590.exe