Skip to content

Commit 056b0c4

Browse files
committed
Merge branches 'exp/privatize-cache' (#9330) and 'exp/undo-GeneratingBindingRedirects-touch' (#9338) into vs17.8
2 parents b052228 + 6f10465 commit 056b0c4

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!-- 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. -->
33
<Project>
44
<PropertyGroup>
5-
<VersionPrefix>17.8.2</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
5+
<VersionPrefix>17.8.3</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
66
<PackageValidationBaselineVersion>17.7.0</PackageValidationBaselineVersion>
77
<AssemblyVersion>15.1.0.0</AssemblyVersion>
88
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>

src/Tasks.UnitTests/GenerateBindingRedirects_Tests.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,8 @@ public void AppConfigFileNotSavedWhenIdentical()
291291
redirectResults2.TargetAppConfigContent.ShouldContain("<assemblyIdentity name=\"System\" publicKeyToken=\"b77a5c561934e089\" culture=\"neutral\" />");
292292
redirectResults2.TargetAppConfigContent.ShouldContain("newVersion=\"40.0.0.0\"");
293293

294-
File.GetLastWriteTime(outputAppConfigFile).ShouldBeGreaterThan(oldTimestamp);
294+
File.GetCreationTime(outputAppConfigFile).ShouldBe(oldTimestamp, TimeSpan.FromSeconds(5));
295+
File.GetLastWriteTime(outputAppConfigFile).ShouldBe(oldTimestamp, TimeSpan.FromSeconds(5));
295296
}
296297

297298
private BindingRedirectsExecutionResult GenerateBindingRedirects(string appConfigFile, string targetAppConfigFile,

src/Tasks/AssemblyDependency/GenerateBindingRedirects.cs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Licensed to the .NET Foundation under one or more agreements.
1+
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

44
using System;
@@ -139,13 +139,6 @@ public override bool Execute()
139139
doc.Save(stream);
140140
}
141141
}
142-
else if (outputExists)
143-
{
144-
// if the file exists and the content is up to date, then touch the output file.
145-
var now = DateTime.Now;
146-
File.SetLastAccessTime(OutputAppConfigFile.ItemSpec, now);
147-
File.SetLastWriteTime(OutputAppConfigFile.ItemSpec, now);
148-
}
149142

150143
return !Log.HasLoggedErrors;
151144
}

0 commit comments

Comments
 (0)