Skip to content

Sync main patch 796cc18f #242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
is-devops-bot merged 1 commit into from
Oct 15, 2026
Merged

Sync main patch 796cc18f #242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion patches/last_processed_commit.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5f0b3ddcc6ee9fe9441e00d55e85b94ea4aad798
796cc18ffaaafd5cea525d6231f5a8c93c11c603
6 changes: 3 additions & 3 deletions patches/runner-main-sdk8-arm.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ index 03290778..efd2b8cd 100644
<RuntimeIdentifiers>win-x64;win-x86;linux-x64;linux-arm64;linux-arm;osx-x64;osx-arm64;win-arm64</RuntimeIdentifiers>
<SelfContained>true</SelfContained>
diff --git a/src/Sdk/Sdk.csproj b/src/Sdk/Sdk.csproj
index 6e77d4bc..d6f1ac63 100644
index 8058f761..90e6cd61 100644
--- a/src/Sdk/Sdk.csproj
+++ b/src/Sdk/Sdk.csproj
@@ -1,7 +1,7 @@
Expand Down Expand Up @@ -541,7 +541,7 @@ index 1c626c5d..0e623335 100644
}
}
diff --git a/src/Test/Test.csproj b/src/Test/Test.csproj
index 843071c8..1cd9aa28 100644
index 5ad39f3c..5cbc9c0d 100644
--- a/src/Test/Test.csproj
+++ b/src/Test/Test.csproj
@@ -1,6 +1,6 @@
Expand Down Expand Up @@ -576,4 +576,4 @@ index 5821cb36..70cfe5c2 100644
+ "version": "9.0.318"
}
}
# From upstream commit: 5f0b3ddcc6ee9fe9441e00d55e85b94ea4aad798
# From upstream commit: 796cc18ffaaafd5cea525d6231f5a8c93c11c603
6 changes: 3 additions & 3 deletions patches/runner-main-sdk8-ppc64le.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ index 97273a1a..78f78701 100644
throw new NotSupportedException(); // Should never reach here.
}
diff --git a/src/Sdk/Sdk.csproj b/src/Sdk/Sdk.csproj
index 6e77d4bc..a4580c60 100644
index 8058f761..53f83c36 100644
--- a/src/Sdk/Sdk.csproj
+++ b/src/Sdk/Sdk.csproj
@@ -4,7 +4,7 @@
Expand Down Expand Up @@ -201,7 +201,7 @@ index bac7d41d..d924f65d 100644
[Trait("Level", "L0")]
[Trait("Category", "Worker")]
diff --git a/src/Test/Test.csproj b/src/Test/Test.csproj
index 843071c8..40407c7f 100644
index 5ad39f3c..183f5ab7 100644
--- a/src/Test/Test.csproj
+++ b/src/Test/Test.csproj
@@ -2,6 +2,10 @@
Expand Down Expand Up @@ -284,4 +284,4 @@ index 056a312e..3f9a3679 100644
<Exec Command="%22$(DesktopMSBuild)%22 Runner.Service/Windows/RunnerService.csproj /p:Configuration=$(BUILDCONFIG) /p:PackageRuntime=$(PackageRuntime) /p:OutputPath=%22$(MSBuildProjectDirectory)/../_layout/bin%22" ConsoleToMSBuild="true" Condition="'$(PackageRuntime)' == 'win-x64' Or '$(PackageRuntime)' == 'win-x86' Or '$(PackageRuntime)' == 'win-arm64'" />
</Target>

# From upstream commit: 5f0b3ddcc6ee9fe9441e00d55e85b94ea4aad798
# From upstream commit: 796cc18ffaaafd5cea525d6231f5a8c93c11c603
6 changes: 3 additions & 3 deletions patches/runner-main-sdk8-s390x.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ index 97273a1a..78f78701 100644
throw new NotSupportedException(); // Should never reach here.
}
diff --git a/src/Sdk/Sdk.csproj b/src/Sdk/Sdk.csproj
index 6e77d4bc..a4580c60 100644
index 8058f761..53f83c36 100644
--- a/src/Sdk/Sdk.csproj
+++ b/src/Sdk/Sdk.csproj
@@ -4,7 +4,7 @@
Expand Down Expand Up @@ -201,7 +201,7 @@ index bac7d41d..d924f65d 100644
[Trait("Level", "L0")]
[Trait("Category", "Worker")]
diff --git a/src/Test/Test.csproj b/src/Test/Test.csproj
index 843071c8..40407c7f 100644
index 5ad39f3c..183f5ab7 100644
--- a/src/Test/Test.csproj
+++ b/src/Test/Test.csproj
@@ -2,6 +2,10 @@
Expand Down Expand Up @@ -284,4 +284,4 @@ index 056a312e..3f9a3679 100644
<Exec Command="%22$(DesktopMSBuild)%22 Runner.Service/Windows/RunnerService.csproj /p:Configuration=$(BUILDCONFIG) /p:PackageRuntime=$(PackageRuntime) /p:OutputPath=%22$(MSBuildProjectDirectory)/../_layout/bin%22" ConsoleToMSBuild="true" Condition="'$(PackageRuntime)' == 'win-x64' Or '$(PackageRuntime)' == 'win-x86' Or '$(PackageRuntime)' == 'win-arm64'" />
</Target>

# From upstream commit: 5f0b3ddcc6ee9fe9441e00d55e85b94ea4aad798
# From upstream commit: 796cc18ffaaafd5cea525d6231f5a8c93c11c603
4 changes: 2 additions & 2 deletions src/Sdk/Sdk.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
<PackageReference Include="System.Security.Cryptography.Cng" Version="5.0.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="10.0.12" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="10.0.13" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="10.0.11" />
<PackageReference Include="Minimatch" Version="2.0.0" />
<PackageReference Include="YamlDotNet.Signed" Version="5.3.0" />
<PackageReference Include="System.Net.Http" Version="4.3.4" />
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
<PackageReference Include="System.Formats.Asn1" Version="10.0.12" />
<PackageReference Include="System.Formats.Asn1" Version="10.0.13" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Test/Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="xunit" Version="2.7.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="4.0.1" />
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
<PackageReference Include="System.Threading.ThreadPool" Version="4.3.0" />
<PackageReference Include="Moq" Version="4.21.0" />
Expand Down
1 change: 0 additions & 1 deletion upstream-runner
Open in desktop
Submodule upstream-runner deleted from 197ca0
Loading