Skip to content

Commit f6665eb

Browse files
authored
[automated] Merge branch 'release/8.0.1xx' => 'release/8.0.3xx' (#20639)
2 parents 1fba122 + 3cbf517 commit f6665eb

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

eng/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ jobs:
8383
pool:
8484
${{ if eq(variables['System.TeamProject'], 'public') }}:
8585
name: $(DncEngPublicBuildPool)
86-
image: 1es-windows-2019-open
86+
image: 1es-windows-2022-open
8787
os: windows
8888
${{ if eq(variables['System.TeamProject'], 'internal') }}:
8989
name: $(DncEngInternalBuildPool)
90-
image: 1es-windows-2019
90+
image: 1es-windows-2022
9191
os: windows
9292
${{ if eq(parameters.agentOs, 'Linux') }}:
9393
pool:

src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@ index ------------
238238
-./sdk/x.y.z/Containers/tasks/net472/System.Reflection.Metadata.dll
239239
-./sdk/x.y.z/Containers/tasks/net472/System.Reflection.MetadataLoadContext.dll
240240
-./sdk/x.y.z/Containers/tasks/net472/System.Runtime.CompilerServices.Unsafe.dll
241-
-./sdk/x.y.z/Containers/tasks/net472/System.Security.AccessControl.dll
242241
-./sdk/x.y.z/Containers/tasks/net472/System.Security.Principal.Windows.dll
243242
-./sdk/x.y.z/Containers/tasks/net472/System.Text.Encodings.Web.dll
244243
-./sdk/x.y.z/Containers/tasks/net472/System.Text.Json.dll

src/finalizer/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
cmake_minimum_required(VERSION 3.15.5)
22

3+
set(CMAKE_GENERATOR_TOOLSET "v143")
4+
35
# Create project named finalizer, this will
46
# will generate Finalizer.vcxproj
57
project(Finalizer)

0 commit comments

Comments
 (0)