зеркало из https://github.com/dotnet/msbuild.git
Merge branches 'exp/privatize-cache' (#9330) and 'exp/undo-GeneratingBindingRedirects-touch' (#9338) into vs17.8
This commit is contained in:
Коммит
056b0c4b6f
|
@ -2,7 +2,7 @@
|
|||
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
|
||||
<Project>
|
||||
<PropertyGroup>
|
||||
<VersionPrefix>17.8.2</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
|
||||
<VersionPrefix>17.8.3</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
|
||||
<PackageValidationBaselineVersion>17.7.0</PackageValidationBaselineVersion>
|
||||
<AssemblyVersion>15.1.0.0</AssemblyVersion>
|
||||
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
|
||||
|
|
|
@ -291,7 +291,8 @@ namespace Microsoft.Build.Tasks.UnitTests
|
|||
redirectResults2.TargetAppConfigContent.ShouldContain("<assemblyIdentity name=\"System\" publicKeyToken=\"b77a5c561934e089\" culture=\"neutral\" />");
|
||||
redirectResults2.TargetAppConfigContent.ShouldContain("newVersion=\"40.0.0.0\"");
|
||||
|
||||
File.GetLastWriteTime(outputAppConfigFile).ShouldBeGreaterThan(oldTimestamp);
|
||||
File.GetCreationTime(outputAppConfigFile).ShouldBe(oldTimestamp, TimeSpan.FromSeconds(5));
|
||||
File.GetLastWriteTime(outputAppConfigFile).ShouldBe(oldTimestamp, TimeSpan.FromSeconds(5));
|
||||
}
|
||||
|
||||
private BindingRedirectsExecutionResult GenerateBindingRedirects(string appConfigFile, string targetAppConfigFile,
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// Licensed to the .NET Foundation under one or more agreements.
|
||||
// The .NET Foundation licenses this file to you under the MIT license.
|
||||
|
||||
using System;
|
||||
|
@ -139,13 +139,6 @@ namespace Microsoft.Build.Tasks
|
|||
doc.Save(stream);
|
||||
}
|
||||
}
|
||||
else if (outputExists)
|
||||
{
|
||||
// if the file exists and the content is up to date, then touch the output file.
|
||||
var now = DateTime.Now;
|
||||
File.SetLastAccessTime(OutputAppConfigFile.ItemSpec, now);
|
||||
File.SetLastWriteTime(OutputAppConfigFile.ItemSpec, now);
|
||||
}
|
||||
|
||||
return !Log.HasLoggedErrors;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче