Skip to content

Commit 96b43ce

Browse files
pavelsavarapavelsavara
committed
Merge commit '6d250c7412a1243b8b4ff4e4915a91aa9d844650' into browser_st_ep
2 parents 25e943a + 6d250c7 commit 96b43ce

File tree

46 files changed

+1305
-427
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1305
-427
lines changed

‎eng/Version.Details.xml

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -84,87 +84,87 @@
8484
</Dependency>
8585
</ProductDependencies>
8686
<ToolsetDependencies>
87-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25052.2">
87+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25056.1">
8888
<Uri>https://github.com/dotnet/arcade</Uri>
89-
<Sha>65d4f1eaf03ed6614df52f5aa16d5f7f0ae9ebcb</Sha>
89+
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
9090
</Dependency>
9191
<!-- Intermediate is necessary for source build. -->
92-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25052.2">
92+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25056.1">
9393
<Uri>https://github.com/dotnet/arcade</Uri>
94-
<Sha>65d4f1eaf03ed6614df52f5aa16d5f7f0ae9ebcb</Sha>
94+
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
9595
<SourceBuild RepoName="arcade" ManagedOnly="true" />
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25052.2">
97+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25056.1">
9898
<Uri>https://github.com/dotnet/arcade</Uri>
99-
<Sha>65d4f1eaf03ed6614df52f5aa16d5f7f0ae9ebcb</Sha>
99+
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
100100
</Dependency>
101-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25052.2">
101+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25056.1">
102102
<Uri>https://github.com/dotnet/arcade</Uri>
103-
<Sha>65d4f1eaf03ed6614df52f5aa16d5f7f0ae9ebcb</Sha>
103+
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25052.2">
105+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25056.1">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>65d4f1eaf03ed6614df52f5aa16d5f7f0ae9ebcb</Sha>
107+
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25052.2">
109+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="10.0.0-beta.25056.1">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>65d4f1eaf03ed6614df52f5aa16d5f7f0ae9ebcb</Sha>
111+
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.25052.2">
113+
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.9.2-beta.25056.1">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>65d4f1eaf03ed6614df52f5aa16d5f7f0ae9ebcb</Sha>
115+
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25052.2">
117+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25056.1">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>65d4f1eaf03ed6614df52f5aa16d5f7f0ae9ebcb</Sha>
119+
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.25052.2">
121+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.9.2-beta.25056.1">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>65d4f1eaf03ed6614df52f5aa16d5f7f0ae9ebcb</Sha>
123+
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25052.2">
125+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="10.0.0-beta.25056.1">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>65d4f1eaf03ed6614df52f5aa16d5f7f0ae9ebcb</Sha>
127+
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25052.2">
129+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="10.0.0-beta.25056.1">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>65d4f1eaf03ed6614df52f5aa16d5f7f0ae9ebcb</Sha>
131+
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
132132
</Dependency>
133-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25052.2">
133+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25056.1">
134134
<Uri>https://github.com/dotnet/arcade</Uri>
135-
<Sha>65d4f1eaf03ed6614df52f5aa16d5f7f0ae9ebcb</Sha>
135+
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
136136
</Dependency>
137-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25052.2">
137+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25056.1">
138138
<Uri>https://github.com/dotnet/arcade</Uri>
139-
<Sha>65d4f1eaf03ed6614df52f5aa16d5f7f0ae9ebcb</Sha>
139+
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
140140
</Dependency>
141-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25052.2">
141+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25056.1">
142142
<Uri>https://github.com/dotnet/arcade</Uri>
143-
<Sha>65d4f1eaf03ed6614df52f5aa16d5f7f0ae9ebcb</Sha>
143+
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
144144
</Dependency>
145-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25052.2">
145+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25056.1">
146146
<Uri>https://github.com/dotnet/arcade</Uri>
147-
<Sha>65d4f1eaf03ed6614df52f5aa16d5f7f0ae9ebcb</Sha>
147+
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
148148
</Dependency>
149-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25052.2">
149+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="10.0.0-beta.25056.1">
150150
<Uri>https://github.com/dotnet/arcade</Uri>
151-
<Sha>65d4f1eaf03ed6614df52f5aa16d5f7f0ae9ebcb</Sha>
151+
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
152152
</Dependency>
153-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25052.2">
153+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25056.1">
154154
<Uri>https://github.com/dotnet/arcade</Uri>
155-
<Sha>65d4f1eaf03ed6614df52f5aa16d5f7f0ae9ebcb</Sha>
155+
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
156156
</Dependency>
157-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25052.2">
157+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25056.1">
158158
<Uri>https://github.com/dotnet/arcade</Uri>
159-
<Sha>65d4f1eaf03ed6614df52f5aa16d5f7f0ae9ebcb</Sha>
159+
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
160160
</Dependency>
161-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25052.2">
161+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="10.0.0-beta.25056.1">
162162
<Uri>https://github.com/dotnet/arcade</Uri>
163-
<Sha>65d4f1eaf03ed6614df52f5aa16d5f7f0ae9ebcb</Sha>
163+
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
164164
</Dependency>
165-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25052.2">
165+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25056.1">
166166
<Uri>https://github.com/dotnet/arcade</Uri>
167-
<Sha>65d4f1eaf03ed6614df52f5aa16d5f7f0ae9ebcb</Sha>
167+
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
168168
</Dependency>
169169
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="10.0.0-beta.24627.1">
170170
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -348,9 +348,9 @@
348348
<Uri>https://github.com/dotnet/xharness</Uri>
349349
<Sha>3119edb6d70fb252e6128b0c7e45d3fc2f49f249</Sha>
350350
</Dependency>
351-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25052.2">
351+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="10.0.0-beta.25056.1">
352352
<Uri>https://github.com/dotnet/arcade</Uri>
353-
<Sha>65d4f1eaf03ed6614df52f5aa16d5f7f0ae9ebcb</Sha>
353+
<Sha>e58820063a8754d418518bce69ca2df0e3b4ac25</Sha>
354354
</Dependency>
355355
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24627.6">
356356
<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
@@ -85,22 +85,22 @@
8585
<!-- SDK dependencies (also used in wasm build tests -->
8686
<MicrosoftDotNetApiCompatTaskVersion>10.0.100-alpha.1.24622.2</MicrosoftDotNetApiCompatTaskVersion>
8787
<!-- Arcade dependencies -->
88-
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25052.2</MicrosoftDotNetBuildTasksFeedVersion>
89-
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25052.2</MicrosoftDotNetCodeAnalysisVersion>
90-
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25052.2</MicrosoftDotNetGenAPIVersion>
91-
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25052.2</MicrosoftDotNetGenFacadesVersion>
92-
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25052.2</MicrosoftDotNetXUnitAssertVersion>
93-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25052.2</MicrosoftDotNetXUnitExtensionsVersion>
94-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25052.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
95-
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25052.2</MicrosoftDotNetBuildTasksArchivesVersion>
96-
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25052.2</MicrosoftDotNetBuildTasksInstallersVersion>
97-
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25052.2</MicrosoftDotNetBuildTasksPackagingVersion>
98-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25052.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
99-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25052.2</MicrosoftDotNetBuildTasksTemplatingVersion>
100-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25052.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
101-
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25052.2</MicrosoftDotNetRemoteExecutorVersion>
102-
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.25052.2</MicrosoftDotNetVersionToolsTasksVersion>
103-
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25052.2</MicrosoftDotNetPackageTestingVersion>
88+
<MicrosoftDotNetBuildTasksFeedVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksFeedVersion>
89+
<MicrosoftDotNetCodeAnalysisVersion>10.0.0-beta.25056.1</MicrosoftDotNetCodeAnalysisVersion>
90+
<MicrosoftDotNetGenAPIVersion>10.0.0-beta.25056.1</MicrosoftDotNetGenAPIVersion>
91+
<MicrosoftDotNetGenFacadesVersion>10.0.0-beta.25056.1</MicrosoftDotNetGenFacadesVersion>
92+
<MicrosoftDotNetXUnitAssertVersion>2.9.2-beta.25056.1</MicrosoftDotNetXUnitAssertVersion>
93+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25056.1</MicrosoftDotNetXUnitExtensionsVersion>
94+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.9.2-beta.25056.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
95+
<MicrosoftDotNetBuildTasksArchivesVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksArchivesVersion>
96+
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksInstallersVersion>
97+
<MicrosoftDotNetBuildTasksPackagingVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksPackagingVersion>
98+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
99+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksTemplatingVersion>
100+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25056.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
101+
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.25056.1</MicrosoftDotNetRemoteExecutorVersion>
102+
<MicrosoftDotNetVersionToolsTasksVersion>10.0.0-beta.25056.1</MicrosoftDotNetVersionToolsTasksVersion>
103+
<MicrosoftDotNetPackageTestingVersion>10.0.0-beta.25056.1</MicrosoftDotNetPackageTestingVersion>
104104
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
105105
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
106106
<!-- NuGet dependencies -->

‎eng/common/core-templates/post-build/post-build.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@ parameters:
4444
displayName: Publish installers and checksums
4545
type: boolean
4646
default: true
47+
48+
- name: requireDefaultChannels
49+
displayName: Fail the build if there are no default channel(s) registrations for the current build
50+
type: boolean
51+
default: false
4752

4853
- name: SDLValidationParameters
4954
type: object
@@ -312,5 +317,6 @@ stages:
312317
-PublishingInfraVersion ${{ parameters.publishingInfraVersion }}
313318
-AzdoToken '$(System.AccessToken)'
314319
-WaitPublishingFinish true
320+
-RequireDefaultChannels ${{ parameters.requireDefaultChannels }}
315321
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
316322
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'

0 commit comments

Comments
 (0)