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
Appearance settings

Commit 73ddfd5

Browse filesBrowse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Source code updates from dotnet/arcade (#1278)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 73d595a commit 73ddfd5
Copy full SHA for 73ddfd5

File tree

Expand file treeCollapse file tree

12 files changed

+137
-95
lines changed
Filter options
Expand file treeCollapse file tree

12 files changed

+137
-95
lines changed

‎src/arcade/eng/Version.Details.xml

Copy file name to clipboardExpand all lines: src/arcade/eng/Version.Details.xml
+9-9Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="arcade" Sha="20fdc50b34ee89e7c54eef0a193c30ed4816597a" BarId="271343" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="arcade" Sha="10060d128e3f470e77265f8490f5e4f72dae738e" BarId="272389" />
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
@@ -27,21 +27,21 @@
2727
<Uri>https://github.com/dotnet/templating</Uri>
2828
<Sha>43b5827697e501c442eb75ffff832cd4df2514fe</Sha>
2929
</Dependency>
30-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25313.2">
30+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25320.1">
3131
<Uri>https://github.com/dotnet/arcade</Uri>
32-
<Sha>7a09c1144283309440a7966c664199944198c920</Sha>
32+
<Sha>1e422be1c79975401cc61f555a97e85180445b6d</Sha>
3333
</Dependency>
34-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25313.2">
34+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25320.1">
3535
<Uri>https://github.com/dotnet/arcade</Uri>
36-
<Sha>7a09c1144283309440a7966c664199944198c920</Sha>
36+
<Sha>1e422be1c79975401cc61f555a97e85180445b6d</Sha>
3737
</Dependency>
38-
<Dependency Name="Microsoft.DotNet.ProductConstructionService.Client" Version="1.1.0-beta.25315.1">
38+
<Dependency Name="Microsoft.DotNet.ProductConstructionService.Client" Version="1.1.0-beta.25319.3">
3939
<Uri>https://github.com/dotnet/arcade-services</Uri>
40-
<Sha>6bb54c7884576f040a4a5620f8532f2114bd2abd</Sha>
40+
<Sha>c7ea37b5ec04c77c528a4880d698bb0a23b59fbf</Sha>
4141
</Dependency>
42-
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25315.1">
42+
<Dependency Name="Microsoft.DotNet.DarcLib" Version="1.1.0-beta.25319.3">
4343
<Uri>https://github.com/dotnet/arcade-services</Uri>
44-
<Sha>6bb54c7884576f040a4a5620f8532f2114bd2abd</Sha>
44+
<Sha>c7ea37b5ec04c77c528a4880d698bb0a23b59fbf</Sha>
4545
</Dependency>
4646
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="10.0.0-prerelease.25262.1">
4747
<Uri>https://github.com/dotnet/xharness</Uri>

‎src/arcade/eng/Versions.props

Copy file name to clipboardExpand all lines: src/arcade/eng/Versions.props
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
<!-- arcade -->
2424
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>9.0.0-beta.24223.1</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
2525
<!-- arcade-services -->
26-
<MicrosoftDotNetProductConstructionServiceClientVersion>1.1.0-beta.25315.1</MicrosoftDotNetProductConstructionServiceClientVersion>
27-
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.25315.1</MicrosoftDotNetDarcLibVersion>
26+
<MicrosoftDotNetProductConstructionServiceClientVersion>1.1.0-beta.25319.3</MicrosoftDotNetProductConstructionServiceClientVersion>
27+
<MicrosoftDotNetDarcLibVersion>1.1.0-beta.25319.3</MicrosoftDotNetDarcLibVersion>
2828
<!-- command-line-api -->
2929
<SystemCommandLineVersion>2.0.0-beta5.25210.1</SystemCommandLineVersion>
3030
<!-- corefx -->

‎src/arcade/eng/common/core-templates/steps/install-microbuild.yml

Copy file name to clipboardExpand all lines: src/arcade/eng/common/core-templates/steps/install-microbuild.yml
+4Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,10 @@ steps:
3030
${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
3131
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
3232
useEsrpCli: true
33+
${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}:
34+
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
35+
${{ else }}:
36+
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
3337
env:
3438
TeamName: $(_TeamName)
3539
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}

‎src/arcade/eng/common/templates/vmr-build-pr.yml

Copy file name to clipboardExpand all lines: src/arcade/eng/common/templates/vmr-build-pr.yml
+18Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
# This pipeline is used for running the VMR verification of the PR changes in repo-level PRs.
2+
#
3+
# It will run a full set of verification jobs defined in:
4+
# https://github.com/dotnet/dotnet/blob/10060d128e3f470e77265f8490f5e4f72dae738e/eng/pipelines/templates/stages/vmr-build.yml#L27-L38
5+
#
6+
# For repos that do not need to run the full set, you would do the following:
7+
#
8+
# 1. Copy this YML file to a repo-specific location, i.e. outside of eng/common.
9+
#
10+
# 2. Add `verifications` parameter to VMR template reference
11+
#
12+
# Examples:
13+
# - For source-build stage 1 verification, add the following:
14+
# verifications: [ "source-build-stage1" ]
15+
#
16+
# - For Windows only verifications, add the following:
17+
# verifications: [ "unified-build-windows-x64", "unified-build-windows-x86" ]
18+
119
trigger: none
220
pr: none
321

‎src/arcade/global.json

Copy file name to clipboardExpand all lines: src/arcade/global.json
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"dotnet": "10.0.100-preview.6.25315.102"
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25313.2",
16-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25313.2",
15+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25320.1",
16+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25320.1",
1717
"Microsoft.Build.NoTargets": "3.7.0"
1818
}
1919
}

‎src/arcade/scripts/create-preview-flow.ps1

Copy file name to clipboardExpand all lines: src/arcade/scripts/create-preview-flow.ps1
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ if ($AddInternalFlow) {
174174
}
175175

176176
Write-Host "Make default channel for the VMR"
177-
MakeDefaultChannel https://github.com/dotnet/dotnet $SdkBranch $SdkBranch
177+
MakeDefaultChannel https://github.com/dotnet/dotnet $SdkBranch $SdkChannel
178178

179179
if ($AddInternalFlow) {
180180
Write-Host "Make internal default channel for the VMR"

‎src/arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishArtifactsInManifest.proj

Copy file name to clipboardExpand all lines: src/arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishArtifactsInManifest.proj
-2Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
- BARBuildId : BAR ID of the build being published.
1717
- MaestroApiEndpoint : Maestro API/Token. Used for updating asset locations.
1818
- BuildAssetRegistryToken
19-
- NugetPath : Full path to nuget.exe. Used for pushing to AzDO feeds.
2019
- PublishInstallersAndChecksums : Whether installers & checksums should be published.
2120
- AzureDevOpsFeedsKey : Token used to publish to *any* AzDO feed in dnceng.
2221
- PublishSpecialClrFiles : If true, the special coreclr module indexed files like DBI, DAC and SOS are published
@@ -139,7 +138,6 @@
139138
AssetManifestPaths="@(ManifestFiles)"
140139
BlobAssetsBasePath="$(BlobBasePath)"
141140
PackageAssetsBasePath="$(PackageBasePath)"
142-
NugetPath="$(NugetPath)"
143141
AkaMSClientId="$(AkaMSClientId)"
144142
AkaMSClientCertificate="$(AkaMSClientCertificate)"
145143
AkaMSTenant="$(AkaMSTenant)"

‎src/arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishSignedAssets.proj

Copy file name to clipboardExpand all lines: src/arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/SdkTasks/PublishSignedAssets.proj
+1-3Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
- NonShippingFolder : Location of the nonshipping assets about to be published.
1414
- FeedName : Name of the feed that will be created. This will
1515
be appended by '-shipping' and '-nonshipping' depending the case
16-
- NugetPath : Path to nuget.exe
1716
- AzdoTargetFeedPAT : Token to publish assets to feeds
1817
-->
1918

@@ -63,8 +62,7 @@
6362
ShippingFeedName="$(ShippingAzdoPackageFeedURL)"
6463
NonShippingFeedName="$(NonShippingAzdoPackageFeedURL)"
6564
ShippingAssetsFolder="$(ShippingFolder)"
66-
NonShippingAssetsFolder="$(NonShippingFolder)"
67-
NugetPath="$(NugetPath)">
65+
NonShippingAssetsFolder="$(NonShippingFolder)">
6866
</PublishSignedAssets>
6967
</Target>
7068

‎src/arcade/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/PublishArtifactsInManifestTests.cs

Copy file name to clipboardExpand all lines: src/arcade/src/Microsoft.DotNet.Build.Tasks.Feed.Tests/PublishArtifactsInManifestTests.cs
+13-18Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
using Microsoft.Extensions.DependencyInjection;
1919
using Xunit;
2020
using static Microsoft.DotNet.Build.CloudTestTasks.AzureStorageUtils;
21-
using static Microsoft.DotNet.Build.Tasks.Feed.GeneralUtils;
21+
using static Microsoft.DotNet.Build.Tasks.Feed.PublishArtifactsInManifestBase;
2222
using MsBuildUtils = Microsoft.Build.Utilities;
2323

2424
namespace Microsoft.DotNet.Build.Tasks.Feed.Tests
@@ -114,16 +114,14 @@ public async Task PushNugetPackageTestsAsync(int pushAttemptsBeforeSuccess, bool
114114
{
115115
// Setup
116116
var buildEngine = new MockBuildEngine();
117-
// May as well check that the exe is plumbed through from the task.
118-
string fakeNugetExeName = $"{Path.GetRandomFileName()}.exe";
119-
int timesNugetExeCalled = 0;
117+
int timesCalled = 0;
118+
var testPackagePath = TestInputs.GetFullPath(Path.Combine("Nupkgs", "test-package-a.1.0.0.nupkg"));
120119

121120
// Functionality is the same as this is in the base class, create a v2 object to test.
122121
var task = new PublishArtifactsInManifestV3
123122
{
124123
InternalBuild = true,
125124
BuildEngine = buildEngine,
126-
NugetPath = fakeNugetExeName,
127125
MaxRetryCount = 5, // In case the default changes, lock to 5 so the test data works
128126
RetryDelayMilliseconds = 10 // retry faster in test
129127
};
@@ -143,38 +141,35 @@ public async Task PushNugetPackageTestsAsync(int pushAttemptsBeforeSuccess, bool
143141
}
144142
};
145143

146-
Func<string, string, Task<ProcessExecutionResult>> testRunAndLogProcess = (string fakeExePath, string fakeExeArgs) =>
144+
Func<HttpClient, string, string, Stream, Task<NuGetFeedUploadPackageResult>> testPush = (_, feedName, feedUri, _) =>
147145
{
148-
Debug.WriteLine($"Called mocked RunProcessAndGetOutputs() : ExePath = {fakeExePath}, ExeArgs = {fakeExeArgs}");
149-
fakeNugetExeName.Should().Be(fakeExePath);
150-
ProcessExecutionResult result = new ProcessExecutionResult() { StandardError = "fake stderr", StandardOut = "fake stdout" };
151-
timesNugetExeCalled++;
152-
if (timesNugetExeCalled >= pushAttemptsBeforeSuccess)
146+
Debug.WriteLine($"Called test push for {feedName}");
147+
timesCalled++;
148+
if (timesCalled >= pushAttemptsBeforeSuccess)
153149
{
154-
result.ExitCode = 0;
150+
return Task.FromResult(NuGetFeedUploadPackageResult.Success);
155151
}
156152
else
157153
{
158-
result.ExitCode = 1;
154+
return Task.FromResult(NuGetFeedUploadPackageResult.AlreadyExists);
159155
}
160-
return Task.FromResult(result);
161156
};
162157

163158
await task.PushNugetPackageAsync(
164159
config,
165-
null,
166-
"localPackageLocation",
160+
null,
161+
testPackagePath,
167162
"1234",
168163
"version",
169164
"feedaccount",
170165
"feedvisibility",
171166
"feedname",
172167
testCompareLocalPackage,
173-
testRunAndLogProcess);
168+
testPush);
174169
if (!expectedFailure && localPackageMatchesFeed)
175170
{
176171
// Successful retry scenario; make sure we ran the # of retries we thought.
177-
timesNugetExeCalled.Should().BeLessOrEqualTo(task.MaxRetryCount);
172+
timesCalled.Should().BeLessOrEqualTo(task.MaxRetryCount);
178173
}
179174
expectedFailure.Should().Be(task.Log.HasLoggedErrors);
180175
}

‎src/arcade/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifest.cs

Copy file name to clipboardExpand all lines: src/arcade/src/Microsoft.DotNet.Build.Tasks.Feed/src/PublishArtifactsInManifest.cs
-8Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,6 @@ public class PublishArtifactsInManifest : MSBuildTaskBase
111111
/// </summary>
112112
public bool AllowInteractiveAuthentication { get; set; }
113113

114-
/// <summary>
115-
/// Directory where "nuget.exe" is installed. This will be used to publish packages.
116-
/// </summary>
117-
[Required]
118-
public string NugetPath { get; set; }
119-
120114
/// <summary>
121115
/// Whether this build is internal or not. If true, extra checks are done to avoid accidental
122116
/// publishing of assets to public feeds or storage accounts.
@@ -343,7 +337,6 @@ internal PublishArtifactsInManifestBase ConstructPublishingV3Task(BuildModel bui
343337
BARBuildId = this.BARBuildId,
344338
MaestroApiEndpoint = this.MaestroApiEndpoint,
345339
BuildAssetRegistryToken = this.BuildAssetRegistryToken,
346-
NugetPath = this.NugetPath,
347340
InternalBuild = this.InternalBuild,
348341
SkipSafetyChecks = this.SkipSafetyChecks,
349342
AkaMSClientId = this.AkaMSClientId,
@@ -393,7 +386,6 @@ internal PublishArtifactsInManifestBase ConstructPublishingV4Task(BuildModel bui
393386
BARBuildId = this.BARBuildId,
394387
MaestroApiEndpoint = this.MaestroApiEndpoint,
395388
BuildAssetRegistryToken = this.BuildAssetRegistryToken,
396-
NugetPath = this.NugetPath,
397389
InternalBuild = this.InternalBuild,
398390
SkipSafetyChecks = this.SkipSafetyChecks,
399391
AkaMSClientId = this.AkaMSClientId,

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.