Skip to content

Commit ef47b65

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20200827.5 (#41533)
Microsoft.DotNet.GenFacades , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat From Version 5.0.0-beta.20419.21 -> To Version 5.0.0-beta.20427.5 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 10068f4 commit ef47b65

File tree

14 files changed

+220
-177
lines changed

14 files changed

+220
-177
lines changed

‎eng/Version.Details.xml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -10,61 +10,61 @@
1010
</Dependency>
1111
</ProductDependencies>
1212
<ToolsetDependencies>
13-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20419.21">
13+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20427.5">
1414
<Uri>https://github.com/dotnet/arcade</Uri>
15-
<Sha>56a95cc477558c1ccdf16d7abe962849ea970ba4</Sha>
15+
<Sha>f2b7fe854a0b1f78c04dfc065164d6d61040f5b8</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20419.21">
17+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20427.5">
1818
<Uri>https://github.com/dotnet/arcade</Uri>
19-
<Sha>56a95cc477558c1ccdf16d7abe962849ea970ba4</Sha>
19+
<Sha>f2b7fe854a0b1f78c04dfc065164d6d61040f5b8</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20419.21">
21+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20427.5">
2222
<Uri>https://github.com/dotnet/arcade</Uri>
23-
<Sha>56a95cc477558c1ccdf16d7abe962849ea970ba4</Sha>
23+
<Sha>f2b7fe854a0b1f78c04dfc065164d6d61040f5b8</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20419.21">
25+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20427.5">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>56a95cc477558c1ccdf16d7abe962849ea970ba4</Sha>
27+
<Sha>f2b7fe854a0b1f78c04dfc065164d6d61040f5b8</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20419.21">
29+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20427.5">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>56a95cc477558c1ccdf16d7abe962849ea970ba4</Sha>
31+
<Sha>f2b7fe854a0b1f78c04dfc065164d6d61040f5b8</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20419.21">
33+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20427.5">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>56a95cc477558c1ccdf16d7abe962849ea970ba4</Sha>
35+
<Sha>f2b7fe854a0b1f78c04dfc065164d6d61040f5b8</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20419.21">
37+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20427.5">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>56a95cc477558c1ccdf16d7abe962849ea970ba4</Sha>
39+
<Sha>f2b7fe854a0b1f78c04dfc065164d6d61040f5b8</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20419.21">
41+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20427.5">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>56a95cc477558c1ccdf16d7abe962849ea970ba4</Sha>
43+
<Sha>f2b7fe854a0b1f78c04dfc065164d6d61040f5b8</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20419.21">
45+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20427.5">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>56a95cc477558c1ccdf16d7abe962849ea970ba4</Sha>
47+
<Sha>f2b7fe854a0b1f78c04dfc065164d6d61040f5b8</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20419.21">
49+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20427.5">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>56a95cc477558c1ccdf16d7abe962849ea970ba4</Sha>
51+
<Sha>f2b7fe854a0b1f78c04dfc065164d6d61040f5b8</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20419.21">
53+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20427.5">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>56a95cc477558c1ccdf16d7abe962849ea970ba4</Sha>
55+
<Sha>f2b7fe854a0b1f78c04dfc065164d6d61040f5b8</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20419.21">
57+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20427.5">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>56a95cc477558c1ccdf16d7abe962849ea970ba4</Sha>
59+
<Sha>f2b7fe854a0b1f78c04dfc065164d6d61040f5b8</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.20419.21">
61+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.20427.5">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>56a95cc477558c1ccdf16d7abe962849ea970ba4</Sha>
63+
<Sha>f2b7fe854a0b1f78c04dfc065164d6d61040f5b8</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20419.21">
65+
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20427.5">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>56a95cc477558c1ccdf16d7abe962849ea970ba4</Sha>
67+
<Sha>f2b7fe854a0b1f78c04dfc065164d6d61040f5b8</Sha>
6868
</Dependency>
6969
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20200806.6">
7070
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,16 @@
5151
<!-- Pin compiler version to workaround: https://github.com/dotnet/runtime/issues/41100 -->
5252
<MicrosoftNetCompilersToolsetVersion>3.8.0-2.20403.2</MicrosoftNetCompilersToolsetVersion>
5353
<!-- Arcade dependencies -->
54-
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20419.21</MicrosoftDotNetApiCompatVersion>
55-
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20419.21</MicrosoftDotNetBuildTasksFeedVersion>
56-
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20419.21</MicrosoftDotNetCodeAnalysisVersion>
57-
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20419.21</MicrosoftDotNetGenAPIVersion>
58-
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.20419.21</MicrosoftDotNetGenFacadesVersion>
59-
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20419.21</MicrosoftDotNetXUnitExtensionsVersion>
60-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20419.21</MicrosoftDotNetXUnitConsoleRunnerVersion>
61-
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20419.21</MicrosoftDotNetBuildTasksPackagingVersion>
62-
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20419.21</MicrosoftDotNetRemoteExecutorVersion>
63-
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20419.21</MicrosoftDotNetVersionToolsTasksVersion>
54+
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20427.5</MicrosoftDotNetApiCompatVersion>
55+
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20427.5</MicrosoftDotNetBuildTasksFeedVersion>
56+
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20427.5</MicrosoftDotNetCodeAnalysisVersion>
57+
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20427.5</MicrosoftDotNetGenAPIVersion>
58+
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.20427.5</MicrosoftDotNetGenFacadesVersion>
59+
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20427.5</MicrosoftDotNetXUnitExtensionsVersion>
60+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20427.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
61+
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20427.5</MicrosoftDotNetBuildTasksPackagingVersion>
62+
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20427.5</MicrosoftDotNetRemoteExecutorVersion>
63+
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20427.5</MicrosoftDotNetVersionToolsTasksVersion>
6464
<!-- Installer dependencies -->
6565
<MicrosoftNETCoreAppVersion>5.0.0-preview.4.20202.18</MicrosoftNETCoreAppVersion>
6666
<MicrosoftNETCoreDotNetHostVersion>5.0.0-preview.4.20202.18</MicrosoftNETCoreDotNetHostVersion>

‎eng/common/build.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ Param(
2323
[switch][Alias('nobl')]$excludeCIBinarylog,
2424
[switch] $ci,
2525
[switch] $prepareMachine,
26+
[string] $runtimeSourceFeed = '',
27+
[string] $runtimeSourceFeedKey = '',
2628
[switch] $help,
2729
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
2830
)

‎eng/common/build.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,10 @@ projects=''
7676
configuration='Debug'
7777
prepare_machine=false
7878
verbosity='minimal'
79+
runtime_source_feed=''
80+
runtime_source_feed_key=''
7981

8082
properties=''
81-
8283
while [[ $# > 0 ]]; do
8384
opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')"
8485
case "$opt" in
@@ -151,6 +152,14 @@ while [[ $# > 0 ]]; do
151152
node_reuse=$2
152153
shift
153154
;;
155+
-runtimesourcefeed)
156+
runtime_source_feed=$2
157+
shift
158+
;;
159+
-runtimesourcefeedkey)
160+
runtime_source_feed_key=$2
161+
shift
162+
;;
154163
*)
155164
properties="$properties $1"
156165
;;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ rm -rf $TIZEN_TMP_DIR
3030

3131
# Configure Tizen rootfs
3232
echo ">>Start configuring Tizen rootfs"
33-
rm ./usr/lib/libunwind.so
34-
ln -s libunwind.so.8 ./usr/lib/libunwind.so
3533
ln -sfn asm-arm ./usr/include/asm
3634
patch -p1 < $__TIZEN_CROSSDIR/tizen.patch
3735
echo "<<Finish configuring Tizen rootfs"

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,3 @@ diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
77
OUTPUT_FORMAT(elf32-littlearm)
88
-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux.so.3 ) )
99
+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux.so.3 ) )
10-
diff -u -r a/usr/lib/libpthread.so b/usr/lib/libpthread.so
11-
--- a/usr/lib/libpthread.so 2016-12-30 23:00:19.408951841 +0900
12-
+++ b/usr/lib/libpthread.so 2016-12-30 23:00:39.068951801 +0900
13-
@@ -2,4 +2,4 @@
14-
Use the shared library, but some functions are only in
15-
the static library, so try that secondarily. */
16-
OUTPUT_FORMAT(elf32-littlearm)
17-
-GROUP ( /lib/libpthread.so.0 /usr/lib/libpthread_nonshared.a )
18-
+GROUP ( libpthread.so.0 libpthread_nonshared.a )

‎eng/common/performance/blazor_perf.proj

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test">
2+
<PropertyGroup Condition="'$(AGENT_OS)' != 'Windows_NT'">
3+
<Python>python3</Python>
4+
<HelixPreCommands>$(HelixPreCommands);chmod +x $HELIX_WORKITEM_PAYLOAD/SOD/SizeOnDisk</HelixPreCommands>
5+
</PropertyGroup>
6+
7+
<ItemGroup>
8+
<HelixCorrelationPayload Include="$(CorrelationPayloadDirectory)">
9+
<PayloadDirectory>%(Identity)</PayloadDirectory>
10+
</HelixCorrelationPayload>
11+
</ItemGroup>
12+
13+
<PropertyGroup Condition="'$(AGENT_OS)' == 'Windows_NT'">
14+
<ScenarioDirectory>%HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\</ScenarioDirectory>
15+
<BlazorDirectory>$(ScenarioDirectory)blazor\</BlazorDirectory>
16+
</PropertyGroup>
17+
<PropertyGroup Condition="'$(AGENT_OS)' != 'Windows_NT'">
18+
<ScenarioDirectory>$HELIX_CORRELATION_PAYLOAD/performance/src/scenarios/</ScenarioDirectory>
19+
<BlazorDirectory>$(ScenarioDirectory)blazor/</BlazorDirectory>
20+
</PropertyGroup>
21+
22+
<ItemGroup>
23+
<HelixWorkItem Include="SOD - New Blazor Template - Publish">
24+
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
25+
<PreCommands>cd $(BlazorDirectory);$(Python) pre.py publish --msbuild %27/p:_TrimmerDumpDependencies=true%27 --msbuild-static AdditionalMonoLinkerOptions=%27&quot;%24(AdditionalMonoLinkerOptions) --dump-dependencies&quot;%27 --binlog %27./traces/blazor_publish.binlog%27</PreCommands>
26+
<Command>$(Python) test.py sod --scenario-name &quot;%(Identity)&quot;</Command>
27+
<PostCommands>$(Python) post.py</PostCommands>
28+
</HelixWorkItem>
29+
</ItemGroup>
30+
</Project>

0 commit comments

Comments
 (0)