Skip to content

Commit 513d5eb

Browse files
wiktorkwiktork
authored
Merge pull request #9209 from wiktork/dev/wiktork/merge10Again
[release/10.0] Merge main to release
2 parents 5bd6496 + c250a62 commit 513d5eb

13 files changed

Lines changed: 54 additions & 44 deletions

File tree

‎.github/actions/action-utils.js‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,22 @@ const util = require("util");
22
const fs = require("fs");
33
const jsExec = util.promisify(require("child_process").exec);
44

5-
module.exports.installAndRequirePackages = async function(...newPackages)
6-
{
5+
module.exports.installAndRequirePackages = async function (...packages) {
6+
// Back-compat: allow strings ("@actions/core") as well as objects ({ name, version })
7+
const normalized = packages.map(p => typeof p === "string" ? { name: p } : p);
8+
9+
const installSpecs = normalized.map(p =>
10+
p.version ? `${p.name}@${p.version}` : p.name
11+
);
12+
713
console.log("Installing npm dependency");
8-
const { stdout, stderr } = await jsExec(`npm install ${newPackages.join(' ')}`);
14+
const { stdout, stderr } = await jsExec(`npm install ${installSpecs.join(" ")}`);
915
console.log("npm-install stderr:\n\n" + stderr);
1016
console.log("npm-install stdout:\n\n" + stdout);
1117
console.log("Finished installing npm dependencies");
1218

13-
let requiredPackages = [];
14-
for (const packageName of newPackages) {
15-
requiredPackages.push(require(packageName));
16-
}
17-
18-
return requiredPackages;
19-
}
19+
return normalized.map(p => require(p.name));
20+
};
2021

2122
function splitVersionTag(tag) {
2223
const regex = /v(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+)(-(?<versionLabel>[a-zA-Z]+)\.(?<iteration>\d+))?/;

‎.github/actions/generate-release-notes/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const UpdateReleaseNotesLabel = "update-release-notes";
55
const BackportLabel = "backport";
66

77
async function run() {
8-
const [core, github] = await actionUtils.installAndRequirePackages("@actions/core", "@actions/github");
8+
const [core, github] = await actionUtils.installAndRequirePackages({ name: "@actions/core", version: "2" }, { name: "@actions/github", version: "8" });
99

1010
const octokit = github.getOctokit(core.getInput("auth_token", { required: true }));
1111

‎.github/actions/learning-path-staleness-check/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ function ValidateLinks(learningPathContents, repoURLToSearch, modifiedPRFiles, l
202202

203203
const main = async () => {
204204

205-
const [core] = await actionUtils.installAndRequirePackages("@actions/core");
205+
const [core] = await actionUtils.installAndRequirePackages({ name: "@actions/core", version: "2" });
206206

207207
try {
208208
const learningPathDirectory = core.getInput('learningPathsDirectory', { required: true });

‎.github/actions/update-releases-json/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const actionUtils = require('../action-utils.js');
22
const path = require('path');
33

44
async function run() {
5-
const [core, github] = await actionUtils.installAndRequirePackages("@actions/core", "@actions/github");
5+
const [core, github] = await actionUtils.installAndRequirePackages({ name: "@actions/core", version: "2" }, { name: "@actions/github", version: "8" });
66

77
const releasesDataFile = core.getInput("releases_json_file", { required: true });
88
let octokit = undefined;

‎.github/actions/update-releases-md/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const actionUtils = require('../action-utils.js');
22

33
async function run() {
4-
const [core, github] = await actionUtils.installAndRequirePackages("@actions/core", "@actions/github");
4+
const [core, github] = await actionUtils.installAndRequirePackages({ name: "@actions/core", version: "2" }, { name: "@actions/github", version: "8" });
55

66
const releasesDataFile = core.getInput("releases_json_file", { required: true });
77
const outputFile = core.getInput("releases_md_file", { required: true });

‎.github/workflows/spellcheck.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@ jobs:
1717
with:
1818
persist-credentials: false
1919

20-
- uses: streetsidesoftware/cspell-action@9cd41bb518a24fefdafd9880cbab8f0ceba04d28
20+
- uses: streetsidesoftware/cspell-action@de2a73e963e7443969755b648a1008f77033c5b2
2121
name: Documentation spellcheck
2222
if: ${{ !cancelled() }}
2323
with:
2424
files: '**/*.md'
2525
inline: error
2626
incremental_files_only: true
2727

28-
- uses: streetsidesoftware/cspell-action@9cd41bb518a24fefdafd9880cbab8f0ceba04d28
28+
- uses: streetsidesoftware/cspell-action@de2a73e963e7443969755b648a1008f77033c5b2
2929
name: Resx spellcheck
3030
if: ${{ !cancelled() }}
3131
with:
3232
files: 'src/**/*.resx'
3333
inline: error
3434
incremental_files_only: true
3535

36-
- uses: streetsidesoftware/cspell-action@9cd41bb518a24fefdafd9880cbab8f0ceba04d28
36+
- uses: streetsidesoftware/cspell-action@de2a73e963e7443969755b648a1008f77033c5b2
3737
name: Source code spellcheck
3838
if: ${{ !cancelled() }}
3939
with:

‎.github/workflows/submit-to-do-issue.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
# The default artifact download action doesn't support cross-workflow
3636
# artifacts, so use a 3rd party one.
3737
- name: 'Download linting results'
38-
uses: dawidd6/action-download-artifact@8a338493df3d275e4a7a63bcff3b8fe97e51a927
38+
uses: dawidd6/action-download-artifact@8305c0f1062bb0d184d09ef4493ecb9288447732
3939
with:
4040
workflow: ${{env.workflow_name}}
4141
run_id: ${{github.event.workflow_run.id }}

‎eng/Version.Details.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,25 +22,25 @@
2222
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet</Uri>
2323
<Sha>4d3023de605a78ba3e59e50c657eed70f125c68a</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26177.7">
25+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26201.4">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>62dc2defffeadabf6761a9ed7e142692107330c0</Sha>
27+
<Sha>2ad6e0a00c692279222642dbcd6e72eb21572d93</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.26177.7">
29+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.26201.4">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>62dc2defffeadabf6761a9ed7e142692107330c0</Sha>
31+
<Sha>2ad6e0a00c692279222642dbcd6e72eb21572d93</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.26177.7">
33+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.26201.4">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>62dc2defffeadabf6761a9ed7e142692107330c0</Sha>
35+
<Sha>2ad6e0a00c692279222642dbcd6e72eb21572d93</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26177.7">
37+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.26201.4">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>62dc2defffeadabf6761a9ed7e142692107330c0</Sha>
39+
<Sha>2ad6e0a00c692279222642dbcd6e72eb21572d93</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.26177.7">
41+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.26201.4">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>62dc2defffeadabf6761a9ed7e142692107330c0</Sha>
43+
<Sha>2ad6e0a00c692279222642dbcd6e72eb21572d93</Sha>
4444
</Dependency>
4545
<Dependency Name="Microsoft.FileFormats" Version="1.0.707702">
4646
<Uri>https://github.com/dotnet/diagnostics</Uri>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
<!-- dotnet/dotnet references -->
5555
<MicrosoftAspNetCoreAppRuntimewinx64Version>10.0.0</MicrosoftAspNetCoreAppRuntimewinx64Version>
5656
<MicrosoftCodeAnalysisNetAnalyzersVersion>10.0.100</MicrosoftCodeAnalysisNetAnalyzersVersion>
57-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.26177.7</MicrosoftDotNetBuildTasksArchivesVersion>
58-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.26177.7</MicrosoftDotNetCodeAnalysisVersion>
59-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.26177.7</MicrosoftDotNetXUnitExtensionsVersion>
57+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.26201.4</MicrosoftDotNetBuildTasksArchivesVersion>
58+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.26201.4</MicrosoftDotNetCodeAnalysisVersion>
59+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.26201.4</MicrosoftDotNetXUnitExtensionsVersion>
6060
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0</MicrosoftNETCoreAppRuntimewinx64Version>
6161
<SystemCommandLineVersion>2.0.0</SystemCommandLineVersion>
6262
<VSRedistCommonAspNetCoreSharedFrameworkx64100Version>10.0.0-rtm.25523.111</VSRedistCommonAspNetCoreSharedFrameworkx64100Version>

‎eng/dependabot/independent/Versions.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<!-- Third-party references -->
1515
<NewtonsoftJsonVersion>13.0.4</NewtonsoftJsonVersion>
1616
<NJsonSchemaVersion>11.5.2</NJsonSchemaVersion>
17-
<AwsSdkS3Version>4.0.20.2</AwsSdkS3Version>
18-
<AwsSdkSecurityTokenVersion>4.0.5.17</AwsSdkSecurityTokenVersion>
17+
<AwsSdkS3Version>4.0.20.4</AwsSdkS3Version>
18+
<AwsSdkSecurityTokenVersion>4.0.5.19</AwsSdkSecurityTokenVersion>
1919

2020
<!--
2121
Moq version & constants derived from Moq.

0 commit comments

Comments
 (0)