Skip to content

Commit b0be7a1

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20210713.2 (microsoft#918)
Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.SignTool , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21357.3 -> To Version 6.0.0-beta.21363.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 797c799 commit b0be7a1

File tree

6 files changed

+24
-20
lines changed

6 files changed

+24
-20
lines changed

‎eng/Version.Details.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@
1515
</Dependency>
1616
</ProductDependencies>
1717
<ToolsetDependencies>
18-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21357.3">
18+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21363.2">
1919
<Uri>https://github.com/dotnet/arcade</Uri>
20-
<Sha>286d98094b830b8dad769542b2669cb1b75f7097</Sha>
20+
<Sha>1b053babb8a542e3ab20f93b3d0aedc732b7e0c7</Sha>
2121
</Dependency>
22-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21357.3">
22+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21363.2">
2323
<Uri>https://github.com/dotnet/arcade</Uri>
24-
<Sha>286d98094b830b8dad769542b2669cb1b75f7097</Sha>
24+
<Sha>1b053babb8a542e3ab20f93b3d0aedc732b7e0c7</Sha>
2525
</Dependency>
26-
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.21357.3">
26+
<Dependency Name="Microsoft.DotNet.SignTool" Version="6.0.0-beta.21363.2">
2727
<Uri>https://github.com/dotnet/arcade</Uri>
28-
<Sha>286d98094b830b8dad769542b2669cb1b75f7097</Sha>
28+
<Sha>1b053babb8a542e3ab20f93b3d0aedc732b7e0c7</Sha>
2929
</Dependency>
30-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21357.3">
30+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21363.2">
3131
<Uri>https://github.com/dotnet/arcade</Uri>
32-
<Sha>286d98094b830b8dad769542b2669cb1b75f7097</Sha>
32+
<Sha>1b053babb8a542e3ab20f93b3d0aedc732b7e0c7</Sha>
3333
</Dependency>
34-
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="6.0.0-beta.21357.3">
34+
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="6.0.0-beta.21363.2">
3535
<Uri>https://github.com/dotnet/arcade</Uri>
36-
<Sha>286d98094b830b8dad769542b2669cb1b75f7097</Sha>
36+
<Sha>1b053babb8a542e3ab20f93b3d0aedc732b7e0c7</Sha>
3737
</Dependency>
3838
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.20258.6">
3939
<Uri>https://github.com/dotnet/arcade-services</Uri>

‎eng/Versions.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@
9797
<XUnitVersion>2.4.1</XUnitVersion>
9898
<XUnitAbstractionsVersion>2.0.3</XUnitAbstractionsVersion>
9999
<XUnitVSRunnerVersion>2.4.1</XUnitVSRunnerVersion>
100-
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21357.3</MicrosoftDotNetBuildTasksFeedVersion>
101-
<MicrosoftDotNetSignToolVersion>6.0.0-beta.21357.3</MicrosoftDotNetSignToolVersion>
100+
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21363.2</MicrosoftDotNetBuildTasksFeedVersion>
101+
<MicrosoftDotNetSignToolVersion>6.0.0-beta.21363.2</MicrosoftDotNetSignToolVersion>
102102
<MicrosoftAzureDocumentDBVersion>1.22.0</MicrosoftAzureDocumentDBVersion>
103103
<MicrosoftAzureCosmosDBTableVersion>1.1.2</MicrosoftAzureCosmosDBTableVersion>
104104
<MicrosoftAspNetCoreAllVersion>2.0.0</MicrosoftAspNetCoreAllVersion>
@@ -108,7 +108,7 @@
108108
<MicrosoftDotNetMaestroClientVersion>1.1.0-beta.20258.6</MicrosoftDotNetMaestroClientVersion>
109109
<MicrosoftSourceLinkGitHubVersion>1.1.0-beta-21228-01</MicrosoftSourceLinkGitHubVersion>
110110
<MicrosoftSourceLinkAzureReposGitVersion>1.1.0-beta-21228-01</MicrosoftSourceLinkAzureReposGitVersion>
111-
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>6.0.0-beta.21357.3</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
111+
<MicrosoftDotNetSwaggerGeneratorMSBuildVersion>6.0.0-beta.21363.2</MicrosoftDotNetSwaggerGeneratorMSBuildVersion>
112112
<XliffTasksVersion>1.0.0-beta.21265.1</XliffTasksVersion>
113113
<MicrosoftDotNetMaestroTasksVersion>1.1.0-beta.21228.1</MicrosoftDotNetMaestroTasksVersion>
114114
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21264.3</MicrosoftDotNetXHarnessCLIVersion>

‎eng/common/cross/build-rootfs.sh

+5-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ __AlpinePackages="alpine-base"
3333
__AlpinePackages+=" build-base"
3434
__AlpinePackages+=" linux-headers"
3535
__AlpinePackagesEdgeCommunity=" lldb-dev"
36-
__AlpinePackagesEdgeMain=" llvm10-libs"
3736
__AlpinePackagesEdgeMain+=" python3"
3837
__AlpinePackagesEdgeMain+=" libedit"
3938

@@ -115,6 +114,8 @@ while :; do
115114
__UbuntuArch=s390x
116115
__UbuntuRepo="http://ports.ubuntu.com/ubuntu-ports/"
117116
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libunwind8-dev//')
117+
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp-dev//')
118+
__UbuntuPackages=$(echo ${__UbuntuPackages} | sed 's/ libomp5//')
118119
unset __LLDB_Package
119120
;;
120121
x86)
@@ -191,6 +192,8 @@ while :; do
191192
__CodeName=alpine
192193
__UbuntuRepo=
193194
__AlpineVersion=3.9
195+
__AlpinePackagesEdgeMain+=" llvm11-libs"
196+
__AlpinePackagesEdgeMain+=" clang-libs"
194197
;;
195198
alpine3.13)
196199
__CodeName=alpine
@@ -201,6 +204,7 @@ while :; do
201204
__AlpinePackagesEdgeCommunity=
202205
__AlpinePackages+=$__AlpinePackagesEdgeMain
203206
__AlpinePackagesEdgeMain=
207+
__AlpinePackages+=" llvm10-libs"
204208
;;
205209
freebsd11)
206210
__FreeBSDBase="11.3-RELEASE"

‎eng/common/tools.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
[bool]$useInstalledDotNetCli = if (Test-Path variable:useInstalledDotNetCli) { $useInstalledDotNetCli } else { $true }
4343

4444
# Enable repos to use a particular version of the on-line dotnet-install scripts.
45-
# default URL: https://dot.net/v1/dotnet-install.ps1
45+
# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.ps1
4646
[string]$dotnetInstallScriptVersion = if (Test-Path variable:dotnetInstallScriptVersion) { $dotnetInstallScriptVersion } else { 'v1' }
4747

4848
# True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -223,7 +223,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
223223
if (!(Test-Path $installScript)) {
224224
Create-Directory $dotnetRoot
225225
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
226-
$uri = "https://dot.net/$dotnetInstallScriptVersion/dotnet-install.ps1"
226+
$uri = "https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1"
227227

228228
Retry({
229229
Write-Host "GET $uri"

‎eng/common/tools.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ warn_as_error=${warn_as_error:-true}
5454
use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}
5555

5656
# Enable repos to use a particular version of the on-line dotnet-install scripts.
57-
# default URL: https://dot.net/v1/dotnet-install.sh
57+
# default URL: https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh
5858
dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'}
5959

6060
# True to use global NuGet cache instead of restoring packages to repository-local directory.
@@ -262,7 +262,7 @@ function with_retries {
262262
function GetDotNetInstallScript {
263263
local root=$1
264264
local install_script="$root/dotnet-install.sh"
265-
local install_script_url="https://dot.net/$dotnetInstallScriptVersion/dotnet-install.sh"
265+
local install_script_url="https://dotnet.microsoft.com/download/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh"
266266

267267
if [[ ! -a "$install_script" ]]; then
268268
mkdir -p "$root"

‎global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"vswhere": "2.5.2"
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21357.3",
16-
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21357.3"
15+
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21363.2",
16+
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21363.2"
1717
}
1818
}

0 commit comments

Comments
 (0)