Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Jan 23, 2023. It is now read-only.
/coreclrPublic archive

Commit0dee78f

Browse files
committed
Merge in 'release/3.1' changes
2 parents55ac59b +b4f19e3 commit0dee78f

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
<ProductDependencies>
33
</ProductDependencies>
44
<ToolsetDependencies>
5-
<DependencyName="Microsoft.DotNet.Arcade.Sdk"Version="1.0.0-beta.22077.9">
5+
<DependencyName="Microsoft.DotNet.Arcade.Sdk"Version="1.0.0-beta.22114.9">
66
<Uri>https://github.com/dotnet/arcade</Uri>
7-
<Sha>31e3d884010345c19f6335571e34b2b5c7ce13bc</Sha>
7+
<Sha>184ce2c7f17508264ffa19b307d97e7568da05ab</Sha>
88
</Dependency>
9-
<DependencyName="Microsoft.DotNet.Helix.Sdk"Version="2.0.0-beta.22077.9">
9+
<DependencyName="Microsoft.DotNet.Helix.Sdk"Version="2.0.0-beta.22114.9">
1010
<Uri>https://github.com/dotnet/arcade</Uri>
11-
<Sha>31e3d884010345c19f6335571e34b2b5c7ce13bc</Sha>
11+
<Sha>184ce2c7f17508264ffa19b307d97e7568da05ab</Sha>
1212
</Dependency>
13-
<DependencyName="Microsoft.DotNet.Build.Tasks.Feed"Version="2.2.0-beta.22077.9">
13+
<DependencyName="Microsoft.DotNet.Build.Tasks.Feed"Version="2.2.0-beta.22114.9">
1414
<Uri>https://github.com/dotnet/arcade</Uri>
15-
<Sha>31e3d884010345c19f6335571e34b2b5c7ce13bc</Sha>
15+
<Sha>184ce2c7f17508264ffa19b307d97e7568da05ab</Sha>
1616
</Dependency>
17-
<DependencyName="Microsoft.DotNet.Build.Tasks.Packaging"Version="1.0.0-beta.22077.9">
17+
<DependencyName="Microsoft.DotNet.Build.Tasks.Packaging"Version="1.0.0-beta.22114.9">
1818
<Uri>https://github.com/dotnet/arcade</Uri>
19-
<Sha>31e3d884010345c19f6335571e34b2b5c7ce13bc</Sha>
19+
<Sha>184ce2c7f17508264ffa19b307d97e7568da05ab</Sha>
2020
</Dependency>
2121
<DependencyName="Microsoft.Private.CoreFx.NETCoreApp"Version="4.7.0-servicing.21310.1">
2222
<Uri>https://github.com/dotnet/corefx</Uri>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
<UsingToolXliff>false</UsingToolXliff>
1616
<!-- Package versions-->
1717
<!-- arcade-->
18-
<MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.22077.9</MicrosoftDotNetBuildTasksFeedVersion>
19-
<MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.22077.9</MicrosoftDotNetBuildTasksPackagingVersion>
20-
<MicrosoftDotNetHelixSdkVersion>2.0.0-beta.22077.9</MicrosoftDotNetHelixSdkVersion>
18+
<MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.22114.9</MicrosoftDotNetBuildTasksFeedVersion>
19+
<MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.22114.9</MicrosoftDotNetBuildTasksPackagingVersion>
20+
<MicrosoftDotNetHelixSdkVersion>2.0.0-beta.22114.9</MicrosoftDotNetHelixSdkVersion>
2121
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19278.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
2222
<!-- roslyn-->
2323
<MicrosoftNetCompilersToolsetVersion>3.3.0-beta2-19367-02</MicrosoftNetCompilersToolsetVersion>

‎eng/common/templates/job/job.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ jobs:
162162

163163
-${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}:
164164
-task:ComponentGovernanceComponentDetection@0
165+
continueOnError:true
165166

166167
-${{ if eq(parameters.enableMicrobuild, 'true') }}:
167168
-${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"python":"2.7.15"
88
},
99
"msbuild-sdks": {
10-
"Microsoft.DotNet.Arcade.Sdk":"1.0.0-beta.22077.9",
11-
"Microsoft.DotNet.Helix.Sdk":"2.0.0-beta.22077.9",
10+
"Microsoft.DotNet.Arcade.Sdk":"1.0.0-beta.22114.9",
11+
"Microsoft.DotNet.Helix.Sdk":"2.0.0-beta.22114.9",
1212
"Microsoft.Build.NoTargets":"1.0.53",
1313
"Microsoft.Build.Traversal":"2.0.2"
1414
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp