Skip to content

Commit dfabaed

Browse files
author
Mirroring
committed
Merge commit '186fb6445a26bc70fce910c57b4e86390d5b7820'
2 parents b77f74c + 186fb64 commit dfabaed

13 files changed

Lines changed: 102 additions & 20 deletions

File tree

‎eng/Version.Details.xml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -179,29 +179,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
179179
</ProductDependencies>
180180
<ToolsetDependencies>
181181
<!-- Arcade -->
182-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25515.1">
182+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25562.3">
183183
<Uri>https://github.com/dotnet/arcade</Uri>
184-
<Sha>6544413e02741855b701468aa8afc6cf8ca62c72</Sha>
184+
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
185185
</Dependency>
186-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.25515.1">
186+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.25562.3">
187187
<Uri>https://github.com/dotnet/arcade</Uri>
188-
<Sha>6544413e02741855b701468aa8afc6cf8ca62c72</Sha>
188+
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
189189
</Dependency>
190-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.25515.1">
190+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.25562.3">
191191
<Uri>https://github.com/dotnet/arcade</Uri>
192-
<Sha>6544413e02741855b701468aa8afc6cf8ca62c72</Sha>
192+
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
193193
</Dependency>
194-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25515.1">
194+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25562.3">
195195
<Uri>https://github.com/dotnet/arcade</Uri>
196-
<Sha>6544413e02741855b701468aa8afc6cf8ca62c72</Sha>
196+
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
197197
</Dependency>
198-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25515.1">
198+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.25562.3">
199199
<Uri>https://github.com/dotnet/arcade</Uri>
200-
<Sha>6544413e02741855b701468aa8afc6cf8ca62c72</Sha>
200+
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
201201
</Dependency>
202-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25515.1">
202+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25562.3">
203203
<Uri>https://github.com/dotnet/arcade</Uri>
204-
<Sha>6544413e02741855b701468aa8afc6cf8ca62c72</Sha>
204+
<Sha>e8483fe03c7d3257c68f6013441da5d72eeb8392</Sha>
205205
</Dependency>
206206
</ToolsetDependencies>
207207
</Dependencies>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@
5656
</PropertyGroup>
5757
<!-- Arcade -->
5858
<PropertyGroup>
59-
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.25515.1</MicrosoftDotNetGenFacadesPackageVersion>
60-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25515.1</MicrosoftDotNetRemoteExecutorVersion>
61-
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.25515.1</MicrosoftDotNetXUnitExtensionsPackageVersion>
59+
<MicrosoftDotNetGenFacadesPackageVersion>8.0.0-beta.25562.3</MicrosoftDotNetGenFacadesPackageVersion>
60+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.25562.3</MicrosoftDotNetRemoteExecutorVersion>
61+
<MicrosoftDotNetXUnitExtensionsPackageVersion>8.0.0-beta.25562.3</MicrosoftDotNetXUnitExtensionsPackageVersion>
6262
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
6363
</PropertyGroup>
6464
<!-- Below have no corresponding entries in Versions.Details.XML because they are not updated via Maestro -->

‎eng/common/cross/x64/sources.list.bionic‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
deb http://archive.ubuntu.com/ubuntu/ bionic main restricted universe
2+
deb-src http://archive.ubuntu.com/ubuntu/ bionic main restricted universe
3+
4+
deb http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe
5+
deb-src http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe
6+
7+
deb http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted
8+
deb-src http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted
9+
10+
deb http://archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse
11+
deb-src http://archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse

‎eng/common/cross/x64/sources.list.xenial‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
deb http://archive.ubuntu.com/ubuntu/ xenial main restricted universe
2+
deb-src http://archive.ubuntu.com/ubuntu/ xenial main restricted universe
3+
4+
deb http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted universe
5+
deb-src http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted universe
6+
7+
deb http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted
8+
deb-src http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted
9+
10+
deb http://archive.ubuntu.com/ubuntu/ xenial-security main restricted universe multiverse
11+
deb-src http://archive.ubuntu.com/ubuntu/ xenial-security main restricted universe multiverse

‎eng/common/cross/x64/tizen/tizen.patch‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
diff -u -r a/usr/lib64/libc.so b/usr/lib64/libc.so
2+
--- a/usr/lib64/libc.so 2016-12-30 23:00:08.284951863 +0900
3+
+++ b/usr/lib64/libc.so 2016-12-30 23:00:32.140951815 +0900
4+
@@ -2,4 +2,4 @@
5+
Use the shared library, but some functions are only in
6+
the static library, so try that secondarily. */
7+
OUTPUT_FORMAT(elf64-x86-64)
8+
-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) )
9+
+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-x86-64.so.2 ) )

‎eng/common/cross/x86/sources.list.focal‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
deb http://archive.ubuntu.com/ubuntu/ focal main restricted universe
2+
deb-src http://archive.ubuntu.com/ubuntu/ focal main restricted universe
3+
4+
deb http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe
5+
deb-src http://archive.ubuntu.com/ubuntu/ focal-updates main restricted universe
6+
7+
deb http://archive.ubuntu.com/ubuntu/ focal-backports main restricted
8+
deb-src http://archive.ubuntu.com/ubuntu/ focal-backports main restricted
9+
10+
deb http://archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse
11+
deb-src http://archive.ubuntu.com/ubuntu/ focal-security main restricted universe multiverse

‎eng/common/cross/x86/sources.list.jammy‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
deb http://archive.ubuntu.com/ubuntu/ jammy main restricted universe
2+
deb-src http://archive.ubuntu.com/ubuntu/ jammy main restricted universe
3+
4+
deb http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe
5+
deb-src http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe
6+
7+
deb http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted
8+
deb-src http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted
9+
10+
deb http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse
11+
deb-src http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse

‎eng/common/cross/x86/tizen/tizen.patch‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
2+
--- a/usr/lib/libc.so 2016-12-30 23:00:08.284951863 +0900
3+
+++ b/usr/lib/libc.so 2016-12-30 23:00:32.140951815 +0900
4+
@@ -2,4 +2,4 @@
5+
Use the shared library, but some functions are only in
6+
the static library, so try that secondarily. */
7+
OUTPUT_FORMAT(elf32-i386)
8+
-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux.so.2 ) )
9+
+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux.so.2 ) )

‎eng/common/templates-official/job/publish-build-assets.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,11 @@ jobs:
152152
BARBuildId: ${{ parameters.BARBuildId }}
153153
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
154154

155+
# Darc is targeting 8.0, so make sure it's installed
156+
- task: UseDotNet@2
157+
inputs:
158+
version: 8.0.x
159+
155160
- task: AzureCLI@2
156161
displayName: Publish Using Darc
157162
inputs:

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,11 @@ stages:
271271

272272
- task: NuGetAuthenticate@1
273273

274+
# Darc is targeting 8.0, so make sure it's installed
275+
- task: UseDotNet@2
276+
inputs:
277+
version: 8.0.x
278+
274279
- task: AzureCLI@2
275280
displayName: Publish Using Darc
276281
inputs:

0 commit comments

Comments
 (0)