Skip to content

Commit 604d40d

Browse files
author
William Li
committed
Merge remote-tracking branch 'origin/release/6.0.1xx-rc1' into cherry-pick-main-changes
2 parents 090cf79 + b5c6989 commit 604d40d

File tree

7 files changed

+258
-143
lines changed

7 files changed

+258
-143
lines changed

‎eng/Version.Details.xml‎

Lines changed: 98 additions & 98 deletions
Large diffs are not rendered by default.

‎eng/Versions.props‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,25 @@
3030
<SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion>
3131
<MicrosoftDotNetSignToolVersion>6.0.0-beta.21412.1</MicrosoftDotNetSignToolVersion>
3232
<MicrosoftWebXdtPackageVersion>3.1.0</MicrosoftWebXdtPackageVersion>
33-
<SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0-rc.1.21418.17</SystemSecurityCryptographyProtectedDataPackageVersion>
33+
<SystemSecurityCryptographyProtectedDataPackageVersion>6.0.0-rc.1.21420.7</SystemSecurityCryptographyProtectedDataPackageVersion>
3434
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
3535
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
3636
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
3737
<SystemTextJsonVersion>4.7.2</SystemTextJsonVersion>
38-
<SystemReflectionMetadataLoadContextVersion>6.0.0-rc.1.21418.17</SystemReflectionMetadataLoadContextVersion>
38+
<SystemReflectionMetadataLoadContextVersion>6.0.0-rc.1.21420.7</SystemReflectionMetadataLoadContextVersion>
3939
<DeploymentReleasesVersion>1.0.0-preview1.1.21112.1</DeploymentReleasesVersion>
4040
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
4141
<SystemCommandLineVersion>2.0.0-beta1.21416.6</SystemCommandLineVersion>
4242
</PropertyGroup>
4343
<PropertyGroup>
4444
<!-- Dependencies from https://github.com/dotnet/runtime -->
45-
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-rc.1.21418.17</MicrosoftNETCoreAppRefPackageVersion>
46-
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-rc.1.21418.17</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
47-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-rc.1.21418.17</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
45+
<MicrosoftNETCoreAppRefPackageVersion>6.0.0-rc.1.21420.7</MicrosoftNETCoreAppRefPackageVersion>
46+
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.0-rc.1.21420.7</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
47+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>6.0.0-rc.1.21420.7</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
4848
<MicrosoftNETCoreAppRuntimePackageVersion>$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</MicrosoftNETCoreAppRuntimePackageVersion>
49-
<MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsDependencyModelPackageVersion>
50-
<MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.0-rc.1.21418.17</MicrosoftNETCoreDotNetHostResolverPackageVersion>
51-
<MicrosoftNETHostModelVersion>6.0.0-rc.1.21418.17</MicrosoftNETHostModelVersion>
49+
<MicrosoftExtensionsDependencyModelPackageVersion>6.0.0-rc.1.21420.7</MicrosoftExtensionsDependencyModelPackageVersion>
50+
<MicrosoftNETCoreDotNetHostResolverPackageVersion>6.0.0-rc.1.21420.7</MicrosoftNETCoreDotNetHostResolverPackageVersion>
51+
<MicrosoftNETHostModelVersion>6.0.0-rc.1.21420.7</MicrosoftNETHostModelVersion>
5252
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>6.0.0-preview.7.21363.9</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
5353
<MicrosoftExtensionsDependencyModelVersion>$(MicrosoftExtensionsDependencyModelPackageVersion)</MicrosoftExtensionsDependencyModelVersion>
5454
</PropertyGroup>
@@ -76,15 +76,15 @@
7676
</PropertyGroup>
7777
<PropertyGroup>
7878
<!-- Dependencies from https://github.com/mono/linker -->
79-
<MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21416.1</MicrosoftNETILLinkTasksPackageVersion>
79+
<MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.6.21419.1</MicrosoftNETILLinkTasksPackageVersion>
8080
<MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksPackageVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
8181
</PropertyGroup>
8282
<PropertyGroup>
8383
<!-- Dependencies from https://github.com/dotnet/runtime -->
84-
<SystemCodeDomPackageVersion>6.0.0-rc.1.21418.17</SystemCodeDomPackageVersion>
85-
<SystemTextEncodingCodePagesPackageVersion>6.0.0-rc.1.21418.17</SystemTextEncodingCodePagesPackageVersion>
84+
<SystemCodeDomPackageVersion>6.0.0-rc.1.21420.7</SystemCodeDomPackageVersion>
85+
<SystemTextEncodingCodePagesPackageVersion>6.0.0-rc.1.21420.7</SystemTextEncodingCodePagesPackageVersion>
8686
<SystemSecurityCryptographyProtectedDataPackageVersion>5.0.0-preview.7.20364.11</SystemSecurityCryptographyProtectedDataPackageVersion>
87-
<SystemResourcesExtensionsPackageVersion>6.0.0-rc.1.21418.17</SystemResourcesExtensionsPackageVersion>
87+
<SystemResourcesExtensionsPackageVersion>6.0.0-rc.1.21420.7</SystemResourcesExtensionsPackageVersion>
8888
</PropertyGroup>
8989
<PropertyGroup>
9090
<!-- Dependencies from https://github.com/dotnet/format -->
@@ -110,44 +110,44 @@
110110
</PropertyGroup>
111111
<PropertyGroup>
112112
<!-- Dependencies from https://github.com/dotnet/templating -->
113-
<MicrosoftTemplateEngineCliPackageVersion>6.0.100-rc.1.21419.4</MicrosoftTemplateEngineCliPackageVersion>
114-
<MicrosoftTemplateEngineAbstractionsPackageVersion>6.0.100-rc.1.21419.4</MicrosoftTemplateEngineAbstractionsPackageVersion>
115-
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>6.0.100-rc.1.21419.4</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
116-
<MicrosoftTemplateEngineUtilsPackageVersion>6.0.100-rc.1.21419.4</MicrosoftTemplateEngineUtilsPackageVersion>
117-
<MicrosoftTemplateSearchCommonPackageVersion>6.0.100-rc.1.21419.4</MicrosoftTemplateSearchCommonPackageVersion>
113+
<MicrosoftTemplateEngineCliPackageVersion>6.0.100-rc.1.21420.7</MicrosoftTemplateEngineCliPackageVersion>
114+
<MicrosoftTemplateEngineAbstractionsPackageVersion>6.0.100-rc.1.21420.7</MicrosoftTemplateEngineAbstractionsPackageVersion>
115+
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>6.0.100-rc.1.21420.7</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
116+
<MicrosoftTemplateEngineUtilsPackageVersion>6.0.100-rc.1.21420.7</MicrosoftTemplateEngineUtilsPackageVersion>
117+
<MicrosoftTemplateSearchCommonPackageVersion>6.0.100-rc.1.21420.7</MicrosoftTemplateSearchCommonPackageVersion>
118118
</PropertyGroup>
119119
<PropertyGroup>
120120
<!-- Dependencies from https://github.com/Microsoft/visualfsharp -->
121121
<MicrosoftFSharpCompilerPackageVersion>12.0.0-beta.21418.3</MicrosoftFSharpCompilerPackageVersion>
122122
</PropertyGroup>
123123
<PropertyGroup>
124124
<!-- Dependencies from https://github.com/dotnet/roslyn -->
125-
<MicrosoftNetCompilersToolsetPackageVersion>4.0.0-4.21418.3</MicrosoftNetCompilersToolsetPackageVersion>
125+
<MicrosoftNetCompilersToolsetPackageVersion>4.0.0-4.21420.4</MicrosoftNetCompilersToolsetPackageVersion>
126126
<MicrosoftCodeAnalysisPackageVersion>4.0.0-4.21412.9</MicrosoftCodeAnalysisPackageVersion>
127-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.0.0-4.21418.3</MicrosoftCodeAnalysisCSharpPackageVersion>
128-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.0.0-4.21418.3</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
129-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.0.0-4.21418.3</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
127+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.0.0-4.21420.4</MicrosoftCodeAnalysisCSharpPackageVersion>
128+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.0.0-4.21420.4</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
129+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.0.0-4.21420.4</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
130130
</PropertyGroup>
131131
<PropertyGroup>
132132
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
133-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>6.0.0-rc.1.21419.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
134-
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>6.0.0-rc.1.21419.1</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
135-
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>6.0.0-rc.1.21419.1</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
136-
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>6.0.0-rc.1.21419.1</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
137-
<MicrosoftAspNetCoreAnalyzersPackageVersion>6.0.0-rc.1.21419.1</MicrosoftAspNetCoreAnalyzersPackageVersion>
138-
<MicrosoftAspNetCoreTestHostPackageVersion>6.0.0-rc.1.21419.1</MicrosoftAspNetCoreTestHostPackageVersion>
139-
<MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>6.0.0-rc.1.21419.1</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
140-
<MicrosoftAspNetCoreRazorLanguageVersion>6.0.0-rc.1.21419.1</MicrosoftAspNetCoreRazorLanguageVersion>
141-
<MicrosoftCodeAnalysisRazorVersion>6.0.0-rc.1.21419.1</MicrosoftCodeAnalysisRazorVersion>
142-
<MicrosoftAspNetCoreRazorInternalSourceGeneratorTransportPackageVersion>6.0.0-rc.1.21419.1</MicrosoftAspNetCoreRazorInternalSourceGeneratorTransportPackageVersion>
133+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>6.0.0-rc.1.21420.10</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
134+
<MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>6.0.0-rc.1.21420.10</MicrosoftAspNetCoreComponentsAnalyzersPackageVersion>
135+
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>6.0.0-rc.1.21420.10</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
136+
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>6.0.0-rc.1.21420.10</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
137+
<MicrosoftAspNetCoreAnalyzersPackageVersion>6.0.0-rc.1.21420.10</MicrosoftAspNetCoreAnalyzersPackageVersion>
138+
<MicrosoftAspNetCoreTestHostPackageVersion>6.0.0-rc.1.21420.10</MicrosoftAspNetCoreTestHostPackageVersion>
139+
<MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>6.0.0-rc.1.21420.10</MicrosoftAspNetCoreMvcRazorExtensionsPackageVersion>
140+
<MicrosoftAspNetCoreRazorLanguageVersion>6.0.0-rc.1.21420.10</MicrosoftAspNetCoreRazorLanguageVersion>
141+
<MicrosoftCodeAnalysisRazorVersion>6.0.0-rc.1.21420.10</MicrosoftCodeAnalysisRazorVersion>
142+
<MicrosoftAspNetCoreRazorInternalSourceGeneratorTransportPackageVersion>6.0.0-rc.1.21420.10</MicrosoftAspNetCoreRazorInternalSourceGeneratorTransportPackageVersion>
143143
</PropertyGroup>
144144
<PropertyGroup>
145145
<!-- Dependencies from https://github.com/dotnet/wpf -->
146-
<MicrosoftNETSdkWindowsDesktopPackageVersion>6.0.0-rc.1.21418.18</MicrosoftNETSdkWindowsDesktopPackageVersion>
146+
<MicrosoftNETSdkWindowsDesktopPackageVersion>6.0.0-rc.1.21419.11</MicrosoftNETSdkWindowsDesktopPackageVersion>
147147
</PropertyGroup>
148148
<PropertyGroup>
149149
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
150-
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.0-rc.1.21418.12</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
150+
<VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>6.0.0-rc.1.21419.15</VSRedistCommonWindowsDesktopSharedFrameworkx6460PackageVersion>
151151
</PropertyGroup>
152152
<PropertyGroup Label="Manually updated">
153153
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

‎src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/TempDirectoryWorkloadManifestProvider.cs‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,40 @@
44
using System;
55
using System.Collections.Generic;
66
using System.IO;
7+
using System.Linq;
78

89
namespace Microsoft.NET.Sdk.WorkloadManifestReader
910
{
1011
public class TempDirectoryWorkloadManifestProvider : IWorkloadManifestProvider
1112
{
12-
private readonly string _sdkVersionBand;
1313
private readonly string _manifestsPath;
14+
private readonly string _sdkVersionBand;
1415

16+
/// <param name="manifestsPath">
17+
/// Result of directly extract manifest NuGet Packages. Should contain folders like
18+
/// microsoft.net.workload.emscripten.manifest-6.0.100.6.0.0-preview.7.21377.2
19+
/// </param>
1520
public TempDirectoryWorkloadManifestProvider(string manifestsPath, string sdkVersion)
1621
{
1722
_manifestsPath = manifestsPath;
1823
_sdkVersionBand = sdkVersion;
1924
}
2025

21-
public IEnumerable<(string manifestId, string? informationalPath, Func<Stream> openManifestStream)> GetManifests()
26+
public IEnumerable<(string manifestId, string? informationalPath, Func<Stream> openManifestStream)>
27+
GetManifests()
2228
{
2329
foreach (var workloadManifestDirectory in GetManifestDirectories())
2430
{
25-
var workloadManifest = Path.Combine(workloadManifestDirectory, "WorkloadManifest.json");
26-
var id = Path.GetFileName(workloadManifestDirectory);
27-
yield return (id, workloadManifest, () => File.OpenRead(workloadManifest));
31+
string? workloadManifest = Path.Combine(workloadManifestDirectory, "WorkloadManifest.json");
32+
var manifestId = Path.GetFileName(workloadManifestDirectory);
33+
34+
int index = manifestId.IndexOf(".Manifest", StringComparison.OrdinalIgnoreCase);
35+
if (index >= 0)
36+
{
37+
manifestId = manifestId.Substring(0, index);
38+
}
39+
40+
yield return (manifestId, workloadManifest, () => File.OpenRead(workloadManifest));
2841
}
2942
}
3043

@@ -39,9 +52,6 @@ public IEnumerable<string> GetManifestDirectories()
3952
}
4053
}
4154

42-
public string GetSdkFeatureBand()
43-
{
44-
return _sdkVersionBand;
45-
}
55+
public string GetSdkFeatureBand() => _sdkVersionBand;
4656
}
4757
}

‎src/Tests/Microsoft.NET.Build.Tests/WorkloadTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ public void It_should_fail_to_restore_without_workload_when_multitargeted()
116116
// .HaveStdOutContaining("android");
117117
}
118118

119-
[Fact]
119+
[Fact(Skip = "https://github.com/dotnet/sdk/issues/19866")]
120120
public void It_should_fail_to_build_without_workload_when_multitargeted()
121121
{
122122
var testProject = new TestProject()
@@ -238,7 +238,7 @@ public void It_should_import_aliased_pack()
238238
.BeEquivalentTo("true");
239239
}
240240

241-
[Fact]
241+
[Fact(Skip = "https://github.com/dotnet/sdk/issues/19866")]
242242
public void It_should_get_suggested_workload_by_GetRequiredWorkloads_target()
243243
{
244244
var mainProject = new TestProject()

‎src/Tests/dotnet-workload-search.Tests/MockWorkloadResolver.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public MockWorkloadResolver(IEnumerable<WorkloadResolver.WorkloadInfo> available
2727
public string GetManifestVersion(string manifestId) => throw new NotImplementedException();
2828
public IEnumerable<WorkloadResolver.ManifestInfo> GetInstalledManifests() => throw new NotImplementedException();
2929
public IWorkloadResolver CreateOverlayResolver(IWorkloadManifestProvider overlayManifestProvider) => throw new NotImplementedException();
30-
public string GetSdkFeatureBand() => throw new NotImplementedException();
30+
public string GetSdkFeatureBand() => "12.0.400";
3131
public IEnumerable<WorkloadId> GetUpdatedWorkloads(WorkloadResolver advertisingManifestResolver, IEnumerable<WorkloadId> installedWorkloads) => throw new NotImplementedException();
3232
WorkloadResolver IWorkloadResolver.CreateOverlayResolver(IWorkloadManifestProvider overlayManifestProvider) => throw new NotImplementedException();
3333
}

‎src/Tests/dotnet-workload-update.Tests/TempDirectoryWorkloadManifestProviderTests.cs‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
// Copyright (c) .NET Foundation and contributors. All rights reserved.
2+
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
3+
4+
using System;
5+
using System.Collections.Generic;
6+
using System.IO;
7+
using System.Linq;
8+
using FluentAssertions;
9+
using Microsoft.DotNet.Cli.NuGetPackageDownloader;
10+
using Microsoft.DotNet.Cli.Workload.Install.Tests;
11+
using Microsoft.DotNet.Cli.Workload.Search.Tests;
12+
using Microsoft.DotNet.PackageInstall.Tests;
13+
using Microsoft.DotNet.ToolPackage;
14+
using Microsoft.DotNet.Workloads.Workload.Install;
15+
using Microsoft.Extensions.EnvironmentAbstractions;
16+
using Microsoft.NET.Sdk.WorkloadManifestReader;
17+
using Microsoft.NET.TestFramework;
18+
using Microsoft.NET.TestFramework.Utilities;
19+
using NuGet.Common;
20+
using NuGet.Versioning;
21+
using Xunit;
22+
using Xunit.Abstractions;
23+
24+
namespace dotnet.Tests
25+
{
26+
public class TempDirectoryWorkloadManifestProviderTests : SdkTest
27+
{
28+
private string _manifestDirectory;
29+
private string _testDirectory;
30+
private string _updaterDir;
31+
32+
public TempDirectoryWorkloadManifestProviderTests(ITestOutputHelper logger) : base(logger)
33+
{
34+
}
35+
36+
private void Initialize(string testName)
37+
{
38+
_testDirectory = _testAssetsManager.CreateTestDirectory(testName).Path;
39+
_manifestDirectory = Path.Combine(_testDirectory, "temp-extract");
40+
_updaterDir = Path.Combine(_testDirectory, "temp-dir");
41+
Directory.CreateDirectory(_manifestDirectory);
42+
Directory.CreateDirectory(_updaterDir);
43+
}
44+
45+
[WindowsOnlyFact]
46+
public void ItShouldReturnListOfManifestFiles()
47+
{
48+
Initialize(nameof(ItShouldReturnListOfManifestFiles));
49+
NuGetPackageDownloader nuGetPackageDownloader = new NuGetPackageDownloader(new DirectoryPath(_updaterDir),
50+
null,
51+
new MockFirstPartyNuGetPackageSigningVerifier(),
52+
new NullLogger(), restoreActionConfig: new RestoreActionConfig(NoCache: true));
53+
54+
MockWorkloadResolver mockWorkloadResolver = new(Enumerable.Empty<WorkloadResolver.WorkloadInfo>());
55+
WorkloadManifestUpdater workloadManifestUpdater =
56+
new WorkloadManifestUpdater(new BufferedReporter(),
57+
mockWorkloadResolver, nuGetPackageDownloader,
58+
_updaterDir, _updaterDir, new MockInstallationRecordRepository());
59+
60+
string package = DownloadSamplePackage(new PackageId("Microsoft.NET.Workload.Emscripten.Manifest-6.0.100"),
61+
NuGetVersion.Parse("6.0.0-preview.7.21377.2"), nuGetPackageDownloader);
62+
63+
workloadManifestUpdater.ExtractManifestPackagesToTempDirAsync(new List<string> {package},
64+
new DirectoryPath(_manifestDirectory)).GetAwaiter().GetResult();
65+
66+
TempDirectoryWorkloadManifestProvider tempDirectoryWorkloadManifestProvider =
67+
new TempDirectoryWorkloadManifestProvider(_manifestDirectory, mockWorkloadResolver.GetSdkFeatureBand());
68+
IEnumerable<(string manifestId, string informationalPath, Func<Stream> openManifestStream)> manifest =
69+
tempDirectoryWorkloadManifestProvider.GetManifests();
70+
manifest.First().manifestId.Should()
71+
.NotBe("microsoft.net.workload.emscripten.manifest-6.0.100.6.0.0-preview.7.21377.2");
72+
manifest.First().manifestId.Should()
73+
.BeEquivalentTo("microsoft.net.workload.emscripten");
74+
}
75+
76+
private string DownloadSamplePackage(PackageId packageId, NuGetVersion version,
77+
NuGetPackageDownloader nuGetPackageDownloader)
78+
{
79+
return ExponentialRetry.ExecuteWithRetry(
80+
DownloadMostRecentSamplePackageFromPublicFeed,
81+
result => result != null,
82+
3,
83+
() => ExponentialRetry.Timer(ExponentialRetry.Intervals),
84+
"Run command while retry transient restore error")
85+
.ConfigureAwait(false).GetAwaiter().GetResult();
86+
87+
string DownloadMostRecentSamplePackageFromPublicFeed()
88+
{
89+
try
90+
{
91+
return nuGetPackageDownloader.DownloadPackageAsync(
92+
packageId, version, includePreview: true,
93+
packageSourceLocation: new PackageSourceLocation(
94+
sourceFeedOverrides: new[] {"https://api.nuget.org/v3/index.json"})).GetAwaiter()
95+
.GetResult();
96+
}
97+
catch (Exception)
98+
{
99+
return null;
100+
}
101+
}
102+
}
103+
}
104+
}

‎src/Tests/dotnet.Tests/dotnet.Tests.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@
144144
</Target>
145145

146146
<ItemGroup>
147+
<ProjectReference Include="..\Microsoft.DotNet.PackageInstall.Tests\Microsoft.DotNet.PackageInstall.Tests.csproj" />
147148
<ProjectReference Include="..\Microsoft.NET.TestFramework\Microsoft.NET.TestFramework.csproj" />
148149
<ProjectReference Include="..\Microsoft.DotNet.Tools.Tests.ComponentMocks\Microsoft.DotNet.Tools.Tests.ComponentMocks.csproj" />
149150
<ProjectReference Include="..\..\Cli\dotnet\dotnet.csproj" />

0 commit comments

Comments
 (0)