Skip to content

Commit efd5742

Browse files
author
Mirroring
committed
Merge commit '4f67954b64888688b52ad62c4bce8836f8e6e103'
2 parents a207560 + 4f67954 commit efd5742

File tree

4 files changed

+58
-58
lines changed

4 files changed

+58
-58
lines changed

‎eng/Version.Details.xml

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -111,79 +111,79 @@
111111
</Dependency>
112112
</ProductDependencies>
113113
<ToolsetDependencies>
114-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25164.5">
114+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25214.7">
115115
<Uri>https://github.com/dotnet/arcade</Uri>
116-
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
116+
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
117117
<SourceBuild RepoName="arcade" ManagedOnly="true" />
118118
</Dependency>
119119
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23475.1" CoherentParentDependency="Microsoft.DotNet.Arcade.Sdk">
120120
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
121121
<Sha>73f0850939d96131c28cf6ea6ee5aacb4da0083a</Sha>
122122
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
123123
</Dependency>
124-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25164.5">
124+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25214.7">
125125
<Uri>https://github.com/dotnet/arcade</Uri>
126-
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
126+
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
127127
</Dependency>
128-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.25164.5">
128+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.25214.7">
129129
<Uri>https://github.com/dotnet/arcade</Uri>
130-
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
130+
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
131131
</Dependency>
132-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.25164.5">
132+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.25214.7">
133133
<Uri>https://github.com/dotnet/arcade</Uri>
134-
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
134+
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
135135
</Dependency>
136-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25164.5">
136+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25214.7">
137137
<Uri>https://github.com/dotnet/arcade</Uri>
138-
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
138+
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
139139
</Dependency>
140-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.25164.5">
140+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.25214.7">
141141
<Uri>https://github.com/dotnet/arcade</Uri>
142-
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
142+
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
143143
</Dependency>
144-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.25164.5">
144+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.25214.7">
145145
<Uri>https://github.com/dotnet/arcade</Uri>
146-
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
146+
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
147147
</Dependency>
148-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.25164.5">
148+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.25214.7">
149149
<Uri>https://github.com/dotnet/arcade</Uri>
150-
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
150+
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
151151
</Dependency>
152-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25164.5">
152+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25214.7">
153153
<Uri>https://github.com/dotnet/arcade</Uri>
154-
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
154+
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
155155
</Dependency>
156-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25164.5">
156+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.25214.7">
157157
<Uri>https://github.com/dotnet/arcade</Uri>
158-
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
158+
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
159159
</Dependency>
160-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.25164.5">
160+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.25214.7">
161161
<Uri>https://github.com/dotnet/arcade</Uri>
162-
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
162+
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
163163
</Dependency>
164-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.25164.5">
164+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.25214.7">
165165
<Uri>https://github.com/dotnet/arcade</Uri>
166-
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
166+
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
167167
</Dependency>
168-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.25164.5">
168+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.25214.7">
169169
<Uri>https://github.com/dotnet/arcade</Uri>
170-
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
170+
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
171171
</Dependency>
172-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25164.5">
172+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25214.7">
173173
<Uri>https://github.com/dotnet/arcade</Uri>
174-
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
174+
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
175175
</Dependency>
176-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25164.5">
176+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25214.7">
177177
<Uri>https://github.com/dotnet/arcade</Uri>
178-
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
178+
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
179179
</Dependency>
180-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.25164.5">
180+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.25214.7">
181181
<Uri>https://github.com/dotnet/arcade</Uri>
182-
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
182+
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
183183
</Dependency>
184-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.25164.5">
184+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.25214.7">
185185
<Uri>https://github.com/dotnet/arcade</Uri>
186-
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
186+
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
187187
</Dependency>
188188
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.25211.2">
189189
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -334,9 +334,9 @@
334334
<Uri>https://github.com/dotnet/xharness</Uri>
335335
<Sha>6dbf15dc48cde2bde6f62811ba73241b067b3683</Sha>
336336
</Dependency>
337-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.25164.5">
337+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.25214.7">
338338
<Uri>https://github.com/dotnet/arcade</Uri>
339-
<Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
339+
<Sha>c487e860d456cda2580600ad81fd425d3bba21f7</Sha>
340340
</Dependency>
341341
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23566.3">
342342
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -87,21 +87,21 @@
8787
<!-- SDK dependencies -->
8888
<MicrosoftDotNetApiCompatTaskVersion>8.0.100</MicrosoftDotNetApiCompatTaskVersion>
8989
<!-- Arcade dependencies -->
90-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.25164.5</MicrosoftDotNetBuildTasksFeedVersion>
91-
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.25164.5</MicrosoftDotNetCodeAnalysisVersion>
92-
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.25164.5</MicrosoftDotNetGenAPIVersion>
93-
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.25164.5</MicrosoftDotNetGenFacadesVersion>
94-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25164.5</MicrosoftDotNetXUnitExtensionsVersion>
95-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.25164.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
96-
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.25164.5</MicrosoftDotNetBuildTasksArchivesVersion>
97-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25164.5</MicrosoftDotNetBuildTasksInstallersVersion>
98-
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.25164.5</MicrosoftDotNetBuildTasksPackagingVersion>
99-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.25164.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
100-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25164.5</MicrosoftDotNetBuildTasksTemplatingVersion>
101-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.25164.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
102-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25164.5</MicrosoftDotNetRemoteExecutorVersion>
103-
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.25164.5</MicrosoftDotNetVersionToolsTasksVersion>
104-
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.25164.5</MicrosoftDotNetPackageTestingVersion>
90+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.25214.7</MicrosoftDotNetBuildTasksFeedVersion>
91+
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.25214.7</MicrosoftDotNetCodeAnalysisVersion>
92+
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.25214.7</MicrosoftDotNetGenAPIVersion>
93+
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.25214.7</MicrosoftDotNetGenFacadesVersion>
94+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25214.7</MicrosoftDotNetXUnitExtensionsVersion>
95+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.25214.7</MicrosoftDotNetXUnitConsoleRunnerVersion>
96+
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.25214.7</MicrosoftDotNetBuildTasksArchivesVersion>
97+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.25214.7</MicrosoftDotNetBuildTasksInstallersVersion>
98+
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.25214.7</MicrosoftDotNetBuildTasksPackagingVersion>
99+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.25214.7</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
100+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25214.7</MicrosoftDotNetBuildTasksTemplatingVersion>
101+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.25214.7</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
102+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25214.7</MicrosoftDotNetRemoteExecutorVersion>
103+
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.25214.7</MicrosoftDotNetVersionToolsTasksVersion>
104+
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.25214.7</MicrosoftDotNetPackageTestingVersion>
105105
<!-- NuGet dependencies -->
106106
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
107107
<!-- Installer dependencies -->
@@ -269,7 +269,7 @@
269269
<MicrosoftExtensionsLoggingVersion>3.1.7</MicrosoftExtensionsLoggingVersion>
270270
<MicrosoftSymbolStoreVersion>1.0.406601</MicrosoftSymbolStoreVersion>
271271
<!-- installer version, for testing workloads must be greater than or equal to global.json sdk version -->
272-
<MicrosoftDotnetSdkInternalVersion>8.0.114</MicrosoftDotnetSdkInternalVersion>
272+
<MicrosoftDotnetSdkInternalVersion>8.0.115</MicrosoftDotnetSdkInternalVersion>
273273
<SdkVersionForWorkloadTesting>$(MicrosoftDotnetSdkInternalVersion)</SdkVersionForWorkloadTesting>
274274
</PropertyGroup>
275275
<PropertyGroup>

‎eng/common/sdl/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Guardian.Cli" version="0.109.0"/>
3+
<package id="Microsoft.Guardian.Cli" version="0.199.0"/>
44
</packages>

‎global.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"sdk": {
3-
"version": "8.0.114",
3+
"version": "8.0.115",
44
"allowPrerelease": true,
55
"rollForward": "major"
66
},
77
"tools": {
8-
"dotnet": "8.0.114"
8+
"dotnet": "8.0.115"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25164.5",
12-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25164.5",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25164.5",
11+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25214.7",
12+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25214.7",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25214.7",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
1616
"Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"

0 commit comments

Comments
 (0)