Skip to content

Commit 78f2a7a

Browse files
author
Mirroring
committed
Merge commit '580e8ea9896e785e17f985aac991ad67f895c80a'
2 parents 2d5c9e5 + 580e8ea commit 78f2a7a

File tree

6 files changed

+18
-14
lines changed

6 files changed

+18
-14
lines changed

.azure/pipelines/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,10 @@ extends:
113113
os: windows
114114
spotBugs:
115115
enabled: false
116+
policheck:
117+
enabled: true
118+
tsa:
119+
enabled: true
116120
containers:
117121
alpine319WithNode:
118122
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode

eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -280,22 +280,22 @@
280280
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
281281
<Sha>1b9707a1fa56abb49ac8a286fd89a91527b6c7d3</Sha>
282282
</Dependency>
283-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24413.1">
283+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24459.5">
284284
<Uri>https://github.com/dotnet/arcade</Uri>
285-
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
285+
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
286286
<SourceBuild RepoName="arcade" ManagedOnly="true" />
287287
</Dependency>
288-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24413.1">
288+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24459.5">
289289
<Uri>https://github.com/dotnet/arcade</Uri>
290-
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
290+
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
291291
</Dependency>
292-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24413.1">
292+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24459.5">
293293
<Uri>https://github.com/dotnet/arcade</Uri>
294-
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
294+
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
295295
</Dependency>
296-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24413.1">
296+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24459.5">
297297
<Uri>https://github.com/dotnet/arcade</Uri>
298-
<Sha>c3f5fe044e7115fb66c79db5e074cb341dbe21dd</Sha>
298+
<Sha>685008547318b269dbbb82cfc9ca968126301bbe</Sha>
299299
</Dependency>
300300
</ToolsetDependencies>
301301
</Dependencies>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,8 @@
131131
<MicrosoftEntityFrameworkCoreVersion>6.0.35</MicrosoftEntityFrameworkCoreVersion>
132132
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.35</MicrosoftEntityFrameworkCoreDesignVersion>
133133
<!-- Packages from dotnet/arcade -->
134-
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24413.1</MicrosoftDotNetBuildTasksInstallersVersion>
135-
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24413.1</MicrosoftDotNetBuildTasksTemplatingVersion>
134+
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24459.5</MicrosoftDotNetBuildTasksInstallersVersion>
135+
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24459.5</MicrosoftDotNetBuildTasksTemplatingVersion>
136136
</PropertyGroup>
137137
<!--
138138

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
},
3030
"msbuild-sdks": {
3131
"Yarn.MSBuild": "1.22.19",
32-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24413.1",
33-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24413.1"
32+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24459.5",
33+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24459.5"
3434
}
3535
}

0 commit comments

Comments
 (0)