Skip to content

Commit 8314f8f

Browse files
authored
[automated] Merge branch 'vs17.11' => 'vs17.12' (#11476)
2 parents 8c9f84e + f42f144 commit 8314f8f

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

.opt-prof.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ stages:
5757
cloudBuildResourceName: ComponentBuildUnderTest
5858
testLabPoolName: VS-Platform # The test lab pool to run your tests in
5959
testMachineCleanUpStrategy: ${{parameters.testMachineCleanUpStrategy}}
60-
testMachineImageName: Windows-11-Enterprise-23H2
6160
visualStudioSigning: Test
6261
variables:
6362
- name: branchName # The branch in the VS repo the bootstrapper was based on

.vsts-dotnet.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,9 @@ extends:
122122
steps:
123123
- task: NuGetToolInstaller@1
124124
displayName: 'Install NuGet.exe'
125+
- pwsh: Get-MpComputerStatus
126+
127+
- pwsh: Set-MpPreference -DisableRealtimeMonitoring $true
125128

126129
- task: PowerShell@2
127130
displayName: Setup Private Feeds Credentials

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.12.31</VersionPrefix>
5+
<VersionPrefix>17.12.32</VersionPrefix>
66
<DotNetFinalVersionKind>release</DotNetFinalVersionKind>
77
<PackageValidationBaselineVersion>17.11.4</PackageValidationBaselineVersion>
88
<AssemblyVersion>15.1.0.0</AssemblyVersion>

0 commit comments

Comments
 (0)