WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 982d599

Browse files
dkurepadkurepa
authored
Rollout/2025 03 18 (#4574)
<!-- Link the GitHub or AzDO issue this pull request is associated with. Please copy and paste the full URL rather than using the dotnet/arcade-services# syntax --> #4573
2 parents 8b5a2ff + 49e11b2 commit 982d599

File tree

47 files changed

+910
-336
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+910
-336
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.dnceng.secretmanager": {
6-
"version": "1.1.0-beta.25154.1",
6+
"version": "1.1.0-beta.25161.2",
77
"commands": [
88
"secret-manager"
99
]
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.dnceng.configuration.bootstrap": {
18-
"version": "1.1.0-beta.25154.1",
18+
"version": "1.1.0-beta.25161.2",
1919
"commands": [
2020
"bootstrap-dnceng-configuration"
2121
]

‎.github/copilot-instructions.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
- Rules apply to our C# code.
2+
- Use function-reflective, descriptive names without implementation details.
3+
- For multi-task methods, use descriptive names and document the process.
4+
- Long method names are acceptable.
5+
- Async methods must have an "Async" suffix.
6+
- Avoid using booleans solely to signal success, unless failure is an expected frequent outcome (e.g. TryGet methods).
7+
- Do not return null unless explicitly indicated (e.g., TryCreate).
8+
- Validate early; if validation fails, throw or return immediately.
9+
- After validation, use if/else—not returns—for control flow.
10+
- Keep methods focused; split them if too large.
11+
- Use immutable objects (e.g., records, readonly properties) when possible.
12+
- Never throw generic Exceptions.
13+
- Use structural logging consistently.
14+
- Each method should log its own actions.

‎Directory.Packages.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,19 @@
1818
<PackageVersion Include="Aspire.Hosting.Azure.Storage" Version="$(AspireVersion)" />
1919
<PackageVersion Include="Aspire.Hosting.Azure" Version="$(AspireVersion)" />
2020
<PackageVersion Include="Aspire.Hosting.Redis" Version="$(AspireVersion)" />
21-
<PackageVersion Include="Azure.Core" Version="1.44.1" />
21+
<PackageVersion Include="Azure.Core" Version="1.45.0" />
2222
<PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.0" />
2323
<PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.2.3" />
2424
<PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Keys" Version="1.2.3" />
25-
<PackageVersion Include="Azure.Identity" Version="1.13.1" />
25+
<PackageVersion Include="Azure.Identity" Version="1.13.2" />
2626
<PackageVersion Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.0.0" />
2727
<PackageVersion Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.1.0" />
2828
<PackageVersion Include="Azure.ResourceManager.AppContainers" Version="1.3.0" />
2929
<PackageVersion Include="Azure.Security.KeyVault.Keys" Version="4.7.0" />
3030
<PackageVersion Include="Azure.Security.KeyVault.Secrets" Version="4.7.0" />
3131
<PackageVersion Include="Azure.Storage.Queues" Version="12.20.1" />
3232
<PackageVersion Include="Blazored.SessionStorage" Version="2.4.0" />
33-
<PackageVersion Include="CommandLineParser" Version="2.2.1" />
33+
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
3434
<PackageVersion Include="DistributedLock.Redis" Version="1.0.3" />
3535
<PackageVersion Include="EntityFrameworkCore.Triggers" Version="1.1.1" />
3636
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
@@ -105,7 +105,7 @@
105105
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="$(AspireVersion)" />
106106
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.11.4" />
107107
<PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.11.4" />
108-
<PackageVersion Include="Microsoft.Identity.Web" Version="2.18.2" />
108+
<PackageVersion Include="Microsoft.Identity.Web" Version="3.8.0" />
109109
<PackageVersion Include="Microsoft.TeamFoundationServer.Client" Version="19.232.0-preview" />
110110
<PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
111111
<PackageVersion Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />
@@ -135,12 +135,12 @@
135135
<PackageVersion Include="System.Net.Http" Version="4.3.4" />
136136
<!-- Pin of a transitive dependency. Can be removed after we migrate to net7.0+
137137
https://dnceng.visualstudio.com/internal/_workitems/edit/5117 -->
138-
<PackageVersion Include="System.Security.Cryptography.Xml" Version="8.0.0" />
138+
<PackageVersion Include="System.Security.Cryptography.Xml" Version="8.0.1" />
139139
<PackageVersion Include="System.Text.Encodings.Web" Version="8.0.0" />
140140
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
141141
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
142142
<PackageVersion Include="TextCopy" Version="6.2.1" />
143143
<PackageVersion Include="Verify.NUnit" Version="19.6" />
144144
<PackageVersion Include="YamlDotNet" Version="16.0.0" />
145145
</ItemGroup>
146-
</Project>
146+
</Project>

‎eng/Version.Details.xml‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,95 +1,95 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.DotNet.Internal.Logging" Version="1.1.0-beta.25125.2">
4+
<Dependency Name="Microsoft.DotNet.Internal.Logging" Version="1.1.0-beta.25164.1">
55
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
6-
<Sha>e548efeabc75b978f5acf920d286a2a2f0fbd7ee</Sha>
6+
<Sha>a65d3a07aab506844a13176ca3aa2f6906a62ae2</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.AspNetCore.ApiPagination" Version="1.1.0-beta.25125.2">
8+
<Dependency Name="Microsoft.AspNetCore.ApiPagination" Version="1.1.0-beta.25164.1">
99
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
10-
<Sha>e548efeabc75b978f5acf920d286a2a2f0fbd7ee</Sha>
10+
<Sha>a65d3a07aab506844a13176ca3aa2f6906a62ae2</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.AspNetCore.ApiVersioning" Version="1.1.0-beta.25125.2">
12+
<Dependency Name="Microsoft.AspNetCore.ApiVersioning" Version="1.1.0-beta.25164.1">
1313
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
14-
<Sha>e548efeabc75b978f5acf920d286a2a2f0fbd7ee</Sha>
14+
<Sha>a65d3a07aab506844a13176ca3aa2f6906a62ae2</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.AspNetCore.ApiVersioning.Swashbuckle" Version="1.1.0-beta.25125.2">
16+
<Dependency Name="Microsoft.AspNetCore.ApiVersioning.Swashbuckle" Version="1.1.0-beta.25164.1">
1717
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
18-
<Sha>e548efeabc75b978f5acf920d286a2a2f0fbd7ee</Sha>
18+
<Sha>a65d3a07aab506844a13176ca3aa2f6906a62ae2</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.DncEng.CommandLineLib" Version="1.1.0-beta.25125.2">
20+
<Dependency Name="Microsoft.DncEng.CommandLineLib" Version="1.1.0-beta.25164.1">
2121
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
22-
<Sha>e548efeabc75b978f5acf920d286a2a2f0fbd7ee</Sha>
22+
<Sha>a65d3a07aab506844a13176ca3aa2f6906a62ae2</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.DncEng.Configuration.Extensions" Version="1.1.0-beta.25125.2">
24+
<Dependency Name="Microsoft.DncEng.Configuration.Extensions" Version="1.1.0-beta.25164.1">
2525
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
26-
<Sha>e548efeabc75b978f5acf920d286a2a2f0fbd7ee</Sha>
26+
<Sha>a65d3a07aab506844a13176ca3aa2f6906a62ae2</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.DotNet.GitHub.Authentication" Version="1.1.0-beta.25125.2">
28+
<Dependency Name="Microsoft.DotNet.GitHub.Authentication" Version="1.1.0-beta.25164.1">
2929
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
30-
<Sha>e548efeabc75b978f5acf920d286a2a2f0fbd7ee</Sha>
30+
<Sha>a65d3a07aab506844a13176ca3aa2f6906a62ae2</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.DotNet.Internal.DependencyInjection.Testing" Version="1.1.0-beta.25125.2">
32+
<Dependency Name="Microsoft.DotNet.Internal.DependencyInjection.Testing" Version="1.1.0-beta.25164.1">
3333
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
34-
<Sha>e548efeabc75b978f5acf920d286a2a2f0fbd7ee</Sha>
34+
<Sha>a65d3a07aab506844a13176ca3aa2f6906a62ae2</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.DotNet.Internal.DependencyInjection" Version="1.1.0-beta.25125.2">
36+
<Dependency Name="Microsoft.DotNet.Internal.DependencyInjection" Version="1.1.0-beta.25164.1">
3737
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
38-
<Sha>e548efeabc75b978f5acf920d286a2a2f0fbd7ee</Sha>
38+
<Sha>a65d3a07aab506844a13176ca3aa2f6906a62ae2</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.DotNet.Internal.Testing.DependencyInjection.Abstractions" Version="1.1.0-beta.25125.2">
40+
<Dependency Name="Microsoft.DotNet.Internal.Testing.DependencyInjection.Abstractions" Version="1.1.0-beta.25164.1">
4141
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
42-
<Sha>e548efeabc75b978f5acf920d286a2a2f0fbd7ee</Sha>
42+
<Sha>a65d3a07aab506844a13176ca3aa2f6906a62ae2</Sha>
4343
</Dependency>
44-
<Dependency Name="Microsoft.DotNet.Internal.Testing.DependencyInjectionCodeGen" Version="1.1.0-beta.25125.2">
44+
<Dependency Name="Microsoft.DotNet.Internal.Testing.DependencyInjectionCodeGen" Version="1.1.0-beta.25164.1">
4545
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
46-
<Sha>e548efeabc75b978f5acf920d286a2a2f0fbd7ee</Sha>
46+
<Sha>a65d3a07aab506844a13176ca3aa2f6906a62ae2</Sha>
4747
</Dependency>
48-
<Dependency Name="Microsoft.DotNet.Internal.Testing.Utility" Version="1.1.0-beta.25125.2">
48+
<Dependency Name="Microsoft.DotNet.Internal.Testing.Utility" Version="1.1.0-beta.25164.1">
4949
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
50-
<Sha>e548efeabc75b978f5acf920d286a2a2f0fbd7ee</Sha>
50+
<Sha>a65d3a07aab506844a13176ca3aa2f6906a62ae2</Sha>
5151
</Dependency>
52-
<Dependency Name="Microsoft.DotNet.Kusto" Version="1.1.0-beta.25125.2">
52+
<Dependency Name="Microsoft.DotNet.Kusto" Version="1.1.0-beta.25164.1">
5353
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
54-
<Sha>e548efeabc75b978f5acf920d286a2a2f0fbd7ee</Sha>
54+
<Sha>a65d3a07aab506844a13176ca3aa2f6906a62ae2</Sha>
5555
</Dependency>
56-
<Dependency Name="Microsoft.DotNet.Services.Utility" Version="1.1.0-beta.25125.2">
56+
<Dependency Name="Microsoft.DotNet.Services.Utility" Version="1.1.0-beta.25164.1">
5757
<Uri>https://github.com/dotnet/dnceng-shared</Uri>
58-
<Sha>e548efeabc75b978f5acf920d286a2a2f0fbd7ee</Sha>
58+
<Sha>a65d3a07aab506844a13176ca3aa2f6906a62ae2</Sha>
5959
</Dependency>
6060
</ProductDependencies>
6161
<ToolsetDependencies>
62-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25114.5">
62+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25164.5">
6363
<Uri>https://github.com/dotnet/arcade</Uri>
64-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
64+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
6565
</Dependency>
66-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25114.5">
66+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25164.5">
6767
<Uri>https://github.com/dotnet/arcade</Uri>
68-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
68+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
6969
</Dependency>
70-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25114.5">
70+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25164.5">
7171
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
72+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
7373
</Dependency>
74-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.25114.5">
74+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.25164.5">
7575
<Uri>https://github.com/dotnet/arcade</Uri>
76-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
76+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
7777
</Dependency>
78-
<Dependency Name="Microsoft.DotNet.Git.IssueManager" Version="8.0.0-beta.25114.5">
78+
<Dependency Name="Microsoft.DotNet.Git.IssueManager" Version="8.0.0-beta.25164.5">
7979
<Uri>https://github.com/dotnet/arcade</Uri>
80-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
80+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
8181
</Dependency>
82-
<Dependency Name="Microsoft.DotNet.VersionTools" Version="8.0.0-beta.25114.5">
82+
<Dependency Name="Microsoft.DotNet.VersionTools" Version="8.0.0-beta.25164.5">
8383
<Uri>https://github.com/dotnet/arcade</Uri>
84-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
84+
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
8585
</Dependency>
86-
<Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.25154.1">
86+
<Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.25161.2">
8787
<Uri>https://github.com/dotnet/dnceng</Uri>
88-
<Sha>54eb8e58248998dbf1a9b4a4537fdf82e94a5b1d</Sha>
88+
<Sha>a584d02e4dee6715fc76104ace6192411bc3c4ed</Sha>
8989
</Dependency>
90-
<Dependency Name="Microsoft.DncEng.Configuration.Bootstrap" Version="1.1.0-beta.25154.1">
90+
<Dependency Name="Microsoft.DncEng.Configuration.Bootstrap" Version="1.1.0-beta.25161.2">
9191
<Uri>https://github.com/dotnet/dnceng</Uri>
92-
<Sha>54eb8e58248998dbf1a9b4a4537fdf82e94a5b1d</Sha>
92+
<Sha>a584d02e4dee6715fc76104ace6192411bc3c4ed</Sha>
9393
</Dependency>
9494
</ToolsetDependencies>
9595
</Dependencies>

‎eng/Versions.props‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,31 @@
99
<UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
1010
<MicrosoftNetFrameworkReferenceAssembliesVersion>1.0.0-preview.1</MicrosoftNetFrameworkReferenceAssembliesVersion>
1111
<!-- Libs -->
12-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25114.5</MicrosoftDotNetSignToolVersion>
13-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.25114.5</MicrosoftDotNetBuildTasksFeedVersion>
14-
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>8.0.0-beta.25114.5</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
15-
<MicrosoftDotNetGitIssueManagerVersion>8.0.0-beta.25114.5</MicrosoftDotNetGitIssueManagerVersion>
16-
<MicrosoftDotNetVersionToolsVersion>8.0.0-beta.25114.5</MicrosoftDotNetVersionToolsVersion>
12+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25164.5</MicrosoftDotNetSignToolVersion>
13+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.25164.5</MicrosoftDotNetBuildTasksFeedVersion>
14+
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>8.0.0-beta.25164.5</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
15+
<MicrosoftDotNetGitIssueManagerVersion>8.0.0-beta.25164.5</MicrosoftDotNetGitIssueManagerVersion>
16+
<MicrosoftDotNetVersionToolsVersion>8.0.0-beta.25164.5</MicrosoftDotNetVersionToolsVersion>
1717
<MicrosoftNetTestSdkVersion>17.4.1</MicrosoftNetTestSdkVersion>
18-
<MicrosoftDotNetInternalLoggingVersion>1.1.0-beta.25125.2</MicrosoftDotNetInternalLoggingVersion>
19-
<MicrosoftAspNetCoreApiPaginationVersion>1.1.0-beta.25125.2</MicrosoftAspNetCoreApiPaginationVersion>
20-
<MicrosoftAspNetCoreApiVersioningVersion>1.1.0-beta.25125.2</MicrosoftAspNetCoreApiVersioningVersion>
21-
<MicrosoftAspNetCoreApiVersioningSwashbuckleVersion>1.1.0-beta.25125.2</MicrosoftAspNetCoreApiVersioningSwashbuckleVersion>
22-
<MicrosoftDncEngConfigurationExtensionsVersion>1.1.0-beta.25125.2</MicrosoftDncEngConfigurationExtensionsVersion>
18+
<MicrosoftDotNetInternalLoggingVersion>1.1.0-beta.25164.1</MicrosoftDotNetInternalLoggingVersion>
19+
<MicrosoftAspNetCoreApiPaginationVersion>1.1.0-beta.25164.1</MicrosoftAspNetCoreApiPaginationVersion>
20+
<MicrosoftAspNetCoreApiVersioningVersion>1.1.0-beta.25164.1</MicrosoftAspNetCoreApiVersioningVersion>
21+
<MicrosoftAspNetCoreApiVersioningSwashbuckleVersion>1.1.0-beta.25164.1</MicrosoftAspNetCoreApiVersioningSwashbuckleVersion>
22+
<MicrosoftDncEngConfigurationExtensionsVersion>1.1.0-beta.25164.1</MicrosoftDncEngConfigurationExtensionsVersion>
2323
<MicrosoftDotNetAuthenticationAlgorithmsVersion>1.1.0-beta.25052.1</MicrosoftDotNetAuthenticationAlgorithmsVersion>
24-
<MicrosoftDotNetGitHubAuthenticationVersion>1.1.0-beta.25125.2</MicrosoftDotNetGitHubAuthenticationVersion>
25-
<MicrosoftDotNetInternalDependencyInjectionTestingVersion>1.1.0-beta.25125.2</MicrosoftDotNetInternalDependencyInjectionTestingVersion>
26-
<MicrosoftDotNetInternalDependencyInjectionVersion>1.1.0-beta.25125.2</MicrosoftDotNetInternalDependencyInjectionVersion>
24+
<MicrosoftDotNetGitHubAuthenticationVersion>1.1.0-beta.25164.1</MicrosoftDotNetGitHubAuthenticationVersion>
25+
<MicrosoftDotNetInternalDependencyInjectionTestingVersion>1.1.0-beta.25164.1</MicrosoftDotNetInternalDependencyInjectionTestingVersion>
26+
<MicrosoftDotNetInternalDependencyInjectionVersion>1.1.0-beta.25164.1</MicrosoftDotNetInternalDependencyInjectionVersion>
2727
<MicrosoftDotNetInternalHealthVersion>1.1.0-beta.25052.1</MicrosoftDotNetInternalHealthVersion>
28-
<MicrosoftDotNetInternalTestingDependencyInjectionAbstractionsVersion>1.1.0-beta.25125.2</MicrosoftDotNetInternalTestingDependencyInjectionAbstractionsVersion>
29-
<MicrosoftDotNetInternalTestingDependencyInjectionCodeGenVersion>1.1.0-beta.25125.2</MicrosoftDotNetInternalTestingDependencyInjectionCodeGenVersion>
30-
<MicrosoftDotNetInternalTestingUtilityVersion>1.1.0-beta.25125.2</MicrosoftDotNetInternalTestingUtilityVersion>
31-
<MicrosoftDotNetKustoVersion>1.1.0-beta.25125.2</MicrosoftDotNetKustoVersion>
28+
<MicrosoftDotNetInternalTestingDependencyInjectionAbstractionsVersion>1.1.0-beta.25164.1</MicrosoftDotNetInternalTestingDependencyInjectionAbstractionsVersion>
29+
<MicrosoftDotNetInternalTestingDependencyInjectionCodeGenVersion>1.1.0-beta.25164.1</MicrosoftDotNetInternalTestingDependencyInjectionCodeGenVersion>
30+
<MicrosoftDotNetInternalTestingUtilityVersion>1.1.0-beta.25164.1</MicrosoftDotNetInternalTestingUtilityVersion>
31+
<MicrosoftDotNetKustoVersion>1.1.0-beta.25164.1</MicrosoftDotNetKustoVersion>
3232
<MicrosoftDotNetMetricsVersion>1.1.0-beta.25052.1</MicrosoftDotNetMetricsVersion>
33-
<MicrosoftDotNetServicesUtilityVersion>1.1.0-beta.25125.2</MicrosoftDotNetServicesUtilityVersion>
33+
<MicrosoftDotNetServicesUtilityVersion>1.1.0-beta.25164.1</MicrosoftDotNetServicesUtilityVersion>
3434
<MicrosoftDotNetWebAuthenticationVersion>1.1.0-beta.25053.1</MicrosoftDotNetWebAuthenticationVersion>
35-
<MicrosoftDncEngSecretManagerVersion>1.1.0-beta.25154.1</MicrosoftDncEngSecretManagerVersion>
36-
<MicrosoftDncEngConfigurationBootstrapVersion>1.1.0-beta.25154.1</MicrosoftDncEngConfigurationBootstrapVersion>
35+
<MicrosoftDncEngSecretManagerVersion>1.1.0-beta.25161.2</MicrosoftDncEngSecretManagerVersion>
36+
<MicrosoftDncEngConfigurationBootstrapVersion>1.1.0-beta.25161.2</MicrosoftDncEngConfigurationBootstrapVersion>
3737
</PropertyGroup>
3838
<!--Package names-->
3939
<PropertyGroup>

‎eng/common/cross/toolchain.cmake‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,8 @@ elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$")
280280
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
281281
add_toolchain_linker_flag("-Wl,--rpath-link=${TIZEN_TOOLCHAIN_PATH}")
282282
endif()
283+
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
284+
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
283285
elseif(TARGET_ARCH_NAME STREQUAL "x86")
284286
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
285287
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
@@ -327,6 +329,8 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
327329
if(TARGET_ARCH_NAME STREQUAL "armel")
328330
add_compile_options(-mfloat-abi=softfp)
329331
endif()
332+
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
333+
add_compile_options("--target=${TOOLCHAIN}")
330334
elseif(TARGET_ARCH_NAME STREQUAL "x86")
331335
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
332336
add_compile_options(--target=${TOOLCHAIN})

0 commit comments

Comments
 (0)