Skip to content

Commit c948f12

Browse files
ForgindForgind
committed
fix merge conflicts
2 parents 335d551 + 77d21f6 commit c948f12

File tree

102 files changed

+2772
-517
lines changed

Some content is hidden

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

102 files changed

+2772
-517
lines changed

‎eng/Version.Details.xml

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

‎eng/Versions.props

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
8080
<SystemCommandLineVersion>2.0.0-beta4.24324.3</SystemCommandLineVersion>
8181
<SystemCommandLineRenderingVersion>0.4.0-alpha.24324.3</SystemCommandLineRenderingVersion>
82-
<MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.24368.1</MicrosoftDeploymentDotNetReleasesVersion>
82+
<MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.24373.2</MicrosoftDeploymentDotNetReleasesVersion>
8383
<MicrosoftDiaSymReaderVersion>2.2.0-beta.24327.2</MicrosoftDiaSymReaderVersion>
8484
<MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.2-beta1.22216.1</MicrosoftCodeAnalysisAnalyzerTestingVersion>
8585
<MicrosoftVisualBasicVersion>10.3.0</MicrosoftVisualBasicVersion>
@@ -161,10 +161,10 @@
161161
</PropertyGroup>
162162
<PropertyGroup>
163163
<!-- Dependencies from https://github.com/dotnet/windowsdesktop -->
164-
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24373.2</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
165-
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-preview.7.24373.2</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
166-
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-preview.7.24373.2</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
167-
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-preview.7.24373.2</MicrosoftWindowsDesktopAppRefPackageVersion>
164+
<VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>9.0.0-rc.1.24373.5</VSRedistCommonWindowsDesktopSharedFrameworkx6490PackageVersion>
165+
<VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>9.0.0-rc.1.24373.5</VSRedistCommonWindowsDesktopTargetingPackx6490PackageVersion>
166+
<MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>9.0.0-rc.1.24373.5</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
167+
<MicrosoftWindowsDesktopAppRefPackageVersion>9.0.0-rc.1.24373.5</MicrosoftWindowsDesktopAppRefPackageVersion>
168168
</PropertyGroup>
169169
<PropertyGroup>
170170
<!-- Dependencies from https://github.com/nuget/nuget.client -->
@@ -207,19 +207,19 @@
207207
then use that in Directory.Packages.props.
208208
209209
At usage sites, either we use MicrosoftBuildMinimumVersion, or MicrosoftBuildVersion in source-only modes. -->
210-
<MicrosoftBuildVersion>17.12.0-preview-24368-09</MicrosoftBuildVersion>
211-
<MicrosoftBuildLocalizationVersion>17.12.0-preview-24368-09</MicrosoftBuildLocalizationVersion>
210+
<MicrosoftBuildVersion>17.12.0-preview-24374-02</MicrosoftBuildVersion>
211+
<MicrosoftBuildLocalizationVersion>17.12.0-preview-24374-02</MicrosoftBuildLocalizationVersion>
212212
<MicrosoftBuildMinimumVersion Condition="Exists('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion') and '$(DotNetBuildSourceOnly)' != 'true'">$([System.IO.File]::ReadAllText('$(RepoRoot)src\Layout\redist\minimumMSBuildVersion').Trim())</MicrosoftBuildMinimumVersion>
213213
</PropertyGroup>
214214
<PropertyGroup>
215215
<!-- Dependencies from https://github.com/dotnet/templating -->
216-
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.100-preview.7.24366.7</MicrosoftTemplateEngineAbstractionsPackageVersion>
216+
<MicrosoftTemplateEngineAbstractionsPackageVersion>9.0.100-preview.7.24373.1</MicrosoftTemplateEngineAbstractionsPackageVersion>
217217
<MicrosoftTemplateEngineEdgePackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineEdgePackageVersion>
218218
<MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion>
219219
<MicrosoftTemplateEngineUtilsPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineUtilsPackageVersion>
220220
<MicrosoftTemplateSearchCommonPackageVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateSearchCommonPackageVersion>
221221
<!-- test dependencies -->
222-
<MicrosoftTemplateEngineMocksPackageVersion>9.0.100-preview.7.24366.7</MicrosoftTemplateEngineMocksPackageVersion>
222+
<MicrosoftTemplateEngineMocksPackageVersion>9.0.100-preview.7.24373.1</MicrosoftTemplateEngineMocksPackageVersion>
223223
<MicrosoftTemplateEngineTestHelperPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateEngineTestHelperPackageVersion>
224224
<MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>$(MicrosoftTemplateEngineAbstractionsPackageVersion)</MicrosoftTemplateEngineAuthoringTemplateVerifierVersion>
225225
<MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>$(MicrosoftTemplateEngineMocksPackageVersion)</MicrosoftTemplateSearchTemplateDiscoveryPackageVersion>
@@ -230,41 +230,41 @@
230230
</PropertyGroup>
231231
<PropertyGroup>
232232
<!-- Dependencies from https://github.com/dotnet/roslyn -->
233-
<MicrosoftNetCompilersToolsetVersion>4.12.0-1.24372.18</MicrosoftNetCompilersToolsetVersion>
234-
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-1.24372.18</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
235-
<MicrosoftCodeAnalysisPackageVersion>4.12.0-1.24372.18</MicrosoftCodeAnalysisPackageVersion>
236-
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-1.24372.18</MicrosoftCodeAnalysisCSharpPackageVersion>
237-
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-1.24372.18</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
238-
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-1.24372.18</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
239-
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-1.24372.18</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
240-
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-1.24372.18</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
233+
<MicrosoftNetCompilersToolsetVersion>4.12.0-1.24373.11</MicrosoftNetCompilersToolsetVersion>
234+
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>4.12.0-1.24373.11</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
235+
<MicrosoftCodeAnalysisPackageVersion>4.12.0-1.24373.11</MicrosoftCodeAnalysisPackageVersion>
236+
<MicrosoftCodeAnalysisCSharpPackageVersion>4.12.0-1.24373.11</MicrosoftCodeAnalysisCSharpPackageVersion>
237+
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>4.12.0-1.24373.11</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
238+
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>4.12.0-1.24373.11</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>
239+
<MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>4.12.0-1.24373.11</MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion>
240+
<MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>4.12.0-1.24373.11</MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion>
241241
</PropertyGroup>
242242
<PropertyGroup>
243243
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
244-
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-preview.7.24372.2</MicrosoftAspNetCoreAppRefPackageVersion>
245-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-preview.7.24372.2</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
246-
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>9.0.0-preview.7.24372.2</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
247-
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>9.0.0-preview.7.24372.2</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
248-
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>9.0.0-preview.7.24372.2</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
249-
<MicrosoftAspNetCoreAnalyzersPackageVersion>9.0.0-preview.7.24372.2</MicrosoftAspNetCoreAnalyzersPackageVersion>
250-
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-preview.7.24372.2</MicrosoftAspNetCoreTestHostPackageVersion>
251-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-preview.7.24372.2</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
252-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-preview.7.24372.2</MicrosoftAspNetCoreAppRefInternalPackageVersion>
253-
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.7.24372.2</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
254-
<dotnetdevcertsPackageVersion>9.0.0-preview.7.24372.2</dotnetdevcertsPackageVersion>
255-
<dotnetuserjwtsPackageVersion>9.0.0-preview.7.24372.2</dotnetuserjwtsPackageVersion>
256-
<dotnetusersecretsPackageVersion>9.0.0-preview.7.24372.2</dotnetusersecretsPackageVersion>
244+
<MicrosoftAspNetCoreAppRefPackageVersion>9.0.0-rc.1.24374.1</MicrosoftAspNetCoreAppRefPackageVersion>
245+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-rc.1.24374.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
246+
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>9.0.0-rc.1.24374.1</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
247+
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>9.0.0-rc.1.24374.1</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
248+
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>9.0.0-rc.1.24374.1</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
249+
<MicrosoftAspNetCoreAnalyzersPackageVersion>9.0.0-rc.1.24374.1</MicrosoftAspNetCoreAnalyzersPackageVersion>
250+
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-rc.1.24374.1</MicrosoftAspNetCoreTestHostPackageVersion>
251+
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>9.0.0-rc.1.24374.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
252+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>9.0.0-rc.1.24374.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
253+
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>9.0.0-rc.1.24374.1</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
254+
<dotnetdevcertsPackageVersion>9.0.0-rc.1.24374.1</dotnetdevcertsPackageVersion>
255+
<dotnetuserjwtsPackageVersion>9.0.0-rc.1.24374.1</dotnetuserjwtsPackageVersion>
256+
<dotnetusersecretsPackageVersion>9.0.0-rc.1.24374.1</dotnetusersecretsPackageVersion>
257257
</PropertyGroup>
258258
<PropertyGroup>
259259
<!-- Dependencies from https://github.com/dotnet/razor -->
260-
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24372.4</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
261-
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24372.4</MicrosoftCodeAnalysisRazorToolingInternalVersion>
262-
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24372.4</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
260+
<MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>9.0.0-preview.24373.3</MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion>
261+
<MicrosoftCodeAnalysisRazorToolingInternalVersion>9.0.0-preview.24373.3</MicrosoftCodeAnalysisRazorToolingInternalVersion>
262+
<MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>9.0.0-preview.24373.3</MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion>
263263
</PropertyGroup>
264264
<PropertyGroup>
265265
<!-- Dependencies from https://github.com/dotnet/wpf -->
266-
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-rc.1.24373.4</MicrosoftNETSdkWindowsDesktopPackageVersion>
267-
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-rc.1.24373.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
266+
<MicrosoftNETSdkWindowsDesktopPackageVersion>9.0.0-rc.1.24373.8</MicrosoftNETSdkWindowsDesktopPackageVersion>
267+
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>9.0.0-rc.1.24373.8</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
268268
</PropertyGroup>
269269
<PropertyGroup Label="Runtime and Apphost aliases">
270270
<!-- Runtime and Apphost pack versions are the same for all RIDs. We flow the x64 version above and create aliases without the winx64 here for clarity elsewhere. -->
@@ -299,7 +299,7 @@
299299
<PropertyGroup Label="Infrastructure and test only dependencies">
300300
<VersionToolsVersion>2.2.0-beta.19072.10</VersionToolsVersion>
301301
<DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
302-
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.24279.2</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
302+
<MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>9.0.0-preview.24372.1</MicrosoftDotNetScenarioTestsSdkTemplateTestsVersion>
303303
</PropertyGroup>
304304
<PropertyGroup Label="Manually updated">
305305
<!-- Dependencies from https://github.com/microsoft/MSBuildLocator -->

‎src/Cli/Microsoft.DotNet.Cli.Utils/Command.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public Command(Process process, bool trimtrailingNewlines = false)
2626

2727
public CommandResult Execute()
2828
{
29-
return Execute(_ => { });
29+
return Execute(null);
3030
}
3131
public CommandResult Execute(Action<Process> processStarted)
3232
{

‎src/Cli/dotnet/Installer/Windows/InstallRequestType.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ public enum InstallRequestType
5656
DeleteWorkloadInstallationRecord,
5757

5858
/// <summary>
59-
/// Creates an install state file.
59+
/// Adds manifests to the install state file.
6060
/// </summary>
6161
SaveInstallStateManifestVersions,
6262

6363
/// <summary>
64-
/// Removes an install state file.
64+
/// Removes manifests from an install state file.
6565
/// </summary>
6666
RemoveManifestsFromInstallStateFile,
6767

‎src/Cli/dotnet/ToolManifest/ToolManifestFinder.cs

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -249,18 +249,32 @@ public IReadOnlyList<FilePath> FindByPackageId(PackageId packageId)
249249
{
250250
var result = new List<FilePath>();
251251
bool findAnyManifest = false;
252+
DirectoryPath? rootPath = null;
252253
foreach ((FilePath possibleManifest,
253254
DirectoryPath correspondingDirectory)
254255
in EnumerateDefaultAllPossibleManifests())
255256
{
257+
if (rootPath is not null)
258+
{
259+
if (!correspondingDirectory.Value.Equals(rootPath.Value))
260+
{
261+
break;
262+
}
263+
}
264+
256265
if (_fileSystem.File.Exists(possibleManifest.Value))
257266
{
258267
findAnyManifest = true;
259-
if (_toolManifestEditor.Read(possibleManifest, correspondingDirectory).content
260-
.Any(t => t.PackageId.Equals(packageId)))
268+
(List<ToolManifestPackage> content, bool isRoot) = _toolManifestEditor.Read(possibleManifest, correspondingDirectory);
269+
if (content.Any(t => t.PackageId.Equals(packageId)))
261270
{
262271
result.Add(possibleManifest);
263272
}
273+
274+
if (isRoot)
275+
{
276+
rootPath = correspondingDirectory;
277+
}
264278
}
265279
}
266280

‎src/Cli/dotnet/ToolPackage/ToolPackageFactory.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ namespace Microsoft.DotNet.ToolPackage
1313
internal static class ToolPackageFactory
1414
{
1515
public static (IToolPackageStore, IToolPackageStoreQuery, IToolPackageDownloader) CreateToolPackageStoresAndDownloader(
16-
DirectoryPath? nonGlobalLocation = null, IEnumerable<string> additionalRestoreArguments = null)
16+
DirectoryPath? nonGlobalLocation = null, IEnumerable<string> additionalRestoreArguments = null, string runtimeJsonPathForTests = null)
1717
{
1818
ToolPackageStoreAndQuery toolPackageStore = CreateConcreteToolPackageStore(nonGlobalLocation);
19-
var toolPackageDownloader = new ToolPackageDownloader(toolPackageStore);
19+
var toolPackageDownloader = new ToolPackageDownloader(toolPackageStore, runtimeJsonPathForTests);
2020

2121
return (toolPackageStore, toolPackageStore, toolPackageDownloader);
2222
}

0 commit comments

Comments
 (0)