Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 61cbd57

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[master] Update dependencies from dotnet/arcade mono/linker Microsoft/vstest dotnet/runtime-assets dotnet/xharness (dotnet#40085)
* Update dependencies from https://github.com/dotnet/arcade build 20200724.1 Microsoft.DotNet.XUnitExtensions , 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.XUnitConsoleRunner , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat From Version 5.0.0-beta.20364.3 -> To Version 5.0.0-beta.20374.1 * Update dependencies from https://github.com/mono/linker build 20200728.1 Microsoft.NET.ILLink.Tasks From Version 5.0.0-preview.3.20374.1 -> To Version 5.0.0-preview.3.20378.1 * Update dependencies from https://github.com/microsoft/vstest build 20200730-02 Microsoft.NET.Test.Sdk From Version 16.8.0-preview-20200720-01 -> To Version 16.8.0-preview-20200730-02 * Update dependencies from https://github.com/dotnet/runtime-assets build 2020072.1 System.ComponentModel.TypeConverter.TestData , System.Drawing.Common.TestData , System.IO.Compression.TestData , System.IO.Packaging.TestData , System.Net.TestData , System.Private.Runtime.UnicodeData , System.Security.Cryptography.X509Certificates.TestData , System.Windows.Extensions.TestData From Version 5.0.0-beta.20364.1 -> To Version 5.0.0-beta.20377.1 * Update dependencies from https://github.com/dotnet/xharness build 20200730.1 Microsoft.DotNet.XHarness.CLI , Microsoft.DotNet.XHarness.TestRunners.Xunit From Version 1.0.0-prerelease.20352.3 -> To Version 1.0.0-prerelease.20380.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 412f022 commit 61cbd57

File tree

4 files changed

+104
-93
lines changed

4 files changed

+104
-93
lines changed

‎eng/Version.Details.xml

Lines changed: 52 additions & 52 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.20364.3">
13+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20374.1">
1414
<Uri>https://github.com/dotnet/arcade</Uri>
15-
<Sha>ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915</Sha>
15+
<Sha>f6192d1e284a08ac05041d05fa6e60dec74b24f5</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20364.3">
17+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20374.1">
1818
<Uri>https://github.com/dotnet/arcade</Uri>
19-
<Sha>ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915</Sha>
19+
<Sha>f6192d1e284a08ac05041d05fa6e60dec74b24f5</Sha>
2020
</Dependency>
21-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20364.3">
21+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20374.1">
2222
<Uri>https://github.com/dotnet/arcade</Uri>
23-
<Sha>ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915</Sha>
23+
<Sha>f6192d1e284a08ac05041d05fa6e60dec74b24f5</Sha>
2424
</Dependency>
25-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20364.3">
25+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20374.1">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915</Sha>
27+
<Sha>f6192d1e284a08ac05041d05fa6e60dec74b24f5</Sha>
2828
</Dependency>
29-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20364.3">
29+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20374.1">
3030
<Uri>https://github.com/dotnet/arcade</Uri>
31-
<Sha>ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915</Sha>
31+
<Sha>f6192d1e284a08ac05041d05fa6e60dec74b24f5</Sha>
3232
</Dependency>
33-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20364.3">
33+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20374.1">
3434
<Uri>https://github.com/dotnet/arcade</Uri>
35-
<Sha>ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915</Sha>
35+
<Sha>f6192d1e284a08ac05041d05fa6e60dec74b24f5</Sha>
3636
</Dependency>
37-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20364.3">
37+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20374.1">
3838
<Uri>https://github.com/dotnet/arcade</Uri>
39-
<Sha>ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915</Sha>
39+
<Sha>f6192d1e284a08ac05041d05fa6e60dec74b24f5</Sha>
4040
</Dependency>
41-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20364.3">
41+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="5.0.0-beta.20374.1">
4242
<Uri>https://github.com/dotnet/arcade</Uri>
43-
<Sha>ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915</Sha>
43+
<Sha>f6192d1e284a08ac05041d05fa6e60dec74b24f5</Sha>
4444
</Dependency>
45-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20364.3">
45+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20374.1">
4646
<Uri>https://github.com/dotnet/arcade</Uri>
47-
<Sha>ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915</Sha>
47+
<Sha>f6192d1e284a08ac05041d05fa6e60dec74b24f5</Sha>
4848
</Dependency>
49-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20372.2">
49+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20374.1">
5050
<Uri>https://github.com/dotnet/arcade</Uri>
51-
<Sha>ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915</Sha>
51+
<Sha>f6192d1e284a08ac05041d05fa6e60dec74b24f5</Sha>
5252
</Dependency>
53-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20364.3">
53+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20374.1">
5454
<Uri>https://github.com/dotnet/arcade</Uri>
55-
<Sha>ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915</Sha>
55+
<Sha>f6192d1e284a08ac05041d05fa6e60dec74b24f5</Sha>
5656
</Dependency>
57-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20364.3">
57+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="5.0.0-beta.20374.1">
5858
<Uri>https://github.com/dotnet/arcade</Uri>
59-
<Sha>ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915</Sha>
59+
<Sha>f6192d1e284a08ac05041d05fa6e60dec74b24f5</Sha>
6060
</Dependency>
61-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.20364.3">
61+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="5.0.0-beta.20374.1">
6262
<Uri>https://github.com/dotnet/arcade</Uri>
63-
<Sha>ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915</Sha>
63+
<Sha>f6192d1e284a08ac05041d05fa6e60dec74b24f5</Sha>
6464
</Dependency>
65-
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20364.3">
65+
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="5.0.0-beta.20374.1">
6666
<Uri>https://github.com/dotnet/arcade</Uri>
67-
<Sha>ff5d4b6c8dbdaeacb6e6159d3f8185118dffd915</Sha>
67+
<Sha>f6192d1e284a08ac05041d05fa6e60dec74b24f5</Sha>
6868
</Dependency>
6969
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20190716.1">
7070
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
@@ -86,41 +86,41 @@
8686
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
8787
<Sha>d0bb63d2ec7060714e63ee4082fac48f2e57f3e2</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.8.0-preview-20200720-01">
89+
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.8.0-preview-20200730-02">
9090
<Uri>https://github.com/microsoft/vstest</Uri>
91-
<Sha>069d8bd6357e2dbc260a35016ddbefe5dfec4102</Sha>
91+
<Sha>ddb755f58160c0e7fab50964d665be1bf47ff579</Sha>
9292
</Dependency>
93-
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="5.0.0-beta.20364.1">
93+
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="5.0.0-beta.20377.1">
9494
<Uri>https://github.com/dotnet/runtime-assets</Uri>
95-
<Sha>5a041ae14a25fe6e5db62666778a7adb59d5a056</Sha>
95+
<Sha>4d5781485294568e51a4673719c8ae5ae8955e70</Sha>
9696
</Dependency>
97-
<Dependency Name="System.Drawing.Common.TestData" Version="5.0.0-beta.20364.1">
97+
<Dependency Name="System.Drawing.Common.TestData" Version="5.0.0-beta.20377.1">
9898
<Uri>https://github.com/dotnet/runtime-assets</Uri>
99-
<Sha>5a041ae14a25fe6e5db62666778a7adb59d5a056</Sha>
99+
<Sha>4d5781485294568e51a4673719c8ae5ae8955e70</Sha>
100100
</Dependency>
101-
<Dependency Name="System.IO.Compression.TestData" Version="5.0.0-beta.20364.1">
101+
<Dependency Name="System.IO.Compression.TestData" Version="5.0.0-beta.20377.1">
102102
<Uri>https://github.com/dotnet/runtime-assets</Uri>
103-
<Sha>5a041ae14a25fe6e5db62666778a7adb59d5a056</Sha>
103+
<Sha>4d5781485294568e51a4673719c8ae5ae8955e70</Sha>
104104
</Dependency>
105-
<Dependency Name="System.IO.Packaging.TestData" Version="5.0.0-beta.20364.1">
105+
<Dependency Name="System.IO.Packaging.TestData" Version="5.0.0-beta.20377.1">
106106
<Uri>https://github.com/dotnet/runtime-assets</Uri>
107-
<Sha>5a041ae14a25fe6e5db62666778a7adb59d5a056</Sha>
107+
<Sha>4d5781485294568e51a4673719c8ae5ae8955e70</Sha>
108108
</Dependency>
109-
<Dependency Name="System.Net.TestData" Version="5.0.0-beta.20364.1">
109+
<Dependency Name="System.Net.TestData" Version="5.0.0-beta.20377.1">
110110
<Uri>https://github.com/dotnet/runtime-assets</Uri>
111-
<Sha>5a041ae14a25fe6e5db62666778a7adb59d5a056</Sha>
111+
<Sha>4d5781485294568e51a4673719c8ae5ae8955e70</Sha>
112112
</Dependency>
113-
<Dependency Name="System.Private.Runtime.UnicodeData" Version="5.0.0-beta.20364.1">
113+
<Dependency Name="System.Private.Runtime.UnicodeData" Version="5.0.0-beta.20377.1">
114114
<Uri>https://github.com/dotnet/runtime-assets</Uri>
115-
<Sha>5a041ae14a25fe6e5db62666778a7adb59d5a056</Sha>
115+
<Sha>4d5781485294568e51a4673719c8ae5ae8955e70</Sha>
116116
</Dependency>
117-
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="5.0.0-beta.20364.1">
117+
<Dependency Name="System.Security.Cryptography.X509Certificates.TestData" Version="5.0.0-beta.20377.1">
118118
<Uri>https://github.com/dotnet/runtime-assets</Uri>
119-
<Sha>5a041ae14a25fe6e5db62666778a7adb59d5a056</Sha>
119+
<Sha>4d5781485294568e51a4673719c8ae5ae8955e70</Sha>
120120
</Dependency>
121-
<Dependency Name="System.Windows.Extensions.TestData" Version="5.0.0-beta.20364.1">
121+
<Dependency Name="System.Windows.Extensions.TestData" Version="5.0.0-beta.20377.1">
122122
<Uri>https://github.com/dotnet/runtime-assets</Uri>
123-
<Sha>5a041ae14a25fe6e5db62666778a7adb59d5a056</Sha>
123+
<Sha>4d5781485294568e51a4673719c8ae5ae8955e70</Sha>
124124
</Dependency>
125125
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20365.1">
126126
<Uri>https://github.com/dotnet/llvm-project</Uri>
@@ -182,17 +182,17 @@
182182
<Uri>https://github.com/dotnet/runtime</Uri>
183183
<Sha>0375524a91a47ca4db3ee1be548f74bab7e26e76</Sha>
184184
</Dependency>
185-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-preview.3.20374.1">
185+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="5.0.0-preview.3.20378.1">
186186
<Uri>https://github.com/mono/linker</Uri>
187-
<Sha>8224c7254fc4aa5da70bb7d2e0d1c55bca1e19bf</Sha>
187+
<Sha>7c9b806037e88df7eb40a8151808730133676668</Sha>
188188
</Dependency>
189-
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.20352.3">
189+
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.20380.1">
190190
<Uri>https://github.com/dotnet/xharness</Uri>
191-
<Sha>5c95b40b725e1aa9d596411c453900385cf6f84c</Sha>
191+
<Sha>d5f2dfa6abcab999bd65fb95ac694d4109df405c</Sha>
192192
</Dependency>
193-
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.20352.3">
193+
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.20380.1">
194194
<Uri>https://github.com/dotnet/xharness</Uri>
195-
<Sha>5c95b40b725e1aa9d596411c453900385cf6f84c</Sha>
195+
<Sha>d5f2dfa6abcab999bd65fb95ac694d4109df405c</Sha>
196196
</Dependency>
197197
</ToolsetDependencies>
198198
</Dependencies>

‎eng/Versions.props

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -52,16 +52,16 @@
5252
</ItemGroup>
5353
<PropertyGroup>
5454
<!-- Arcade dependencies -->
55-
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20364.3</MicrosoftDotNetApiCompatVersion>
56-
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20364.3</MicrosoftDotNetBuildTasksFeedVersion>
57-
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20364.3</MicrosoftDotNetCodeAnalysisVersion>
58-
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20364.3</MicrosoftDotNetGenAPIVersion>
59-
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.20364.3</MicrosoftDotNetGenFacadesVersion>
60-
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20367.6</MicrosoftDotNetXUnitExtensionsVersion>
61-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20364.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
62-
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20374.3</MicrosoftDotNetBuildTasksPackagingVersion>
63-
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20367.6</MicrosoftDotNetRemoteExecutorVersion>
64-
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20364.3</MicrosoftDotNetVersionToolsTasksVersion>
55+
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20374.1</MicrosoftDotNetApiCompatVersion>
56+
<MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20374.1</MicrosoftDotNetBuildTasksFeedVersion>
57+
<MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20374.1</MicrosoftDotNetCodeAnalysisVersion>
58+
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20374.1</MicrosoftDotNetGenAPIVersion>
59+
<MicrosoftDotNetGenFacadesVersion>5.0.0-beta.20374.1</MicrosoftDotNetGenFacadesVersion>
60+
<MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20374.1</MicrosoftDotNetXUnitExtensionsVersion>
61+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20374.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
62+
<MicrosoftDotNetBuildTasksPackagingVersion>5.0.0-beta.20374.1</MicrosoftDotNetBuildTasksPackagingVersion>
63+
<MicrosoftDotNetRemoteExecutorVersion>5.0.0-beta.20374.1</MicrosoftDotNetRemoteExecutorVersion>
64+
<MicrosoftDotNetVersionToolsTasksVersion>5.0.0-beta.20374.1</MicrosoftDotNetVersionToolsTasksVersion>
6565
<!-- Installer dependencies -->
6666
<MicrosoftNETCoreAppVersion>5.0.0-preview.4.20202.18</MicrosoftNETCoreAppVersion>
6767
<MicrosoftNETCoreDotNetHostVersion>5.0.0-preview.4.20202.18</MicrosoftNETCoreDotNetHostVersion>
@@ -102,14 +102,14 @@
102102
<MicrosoftWin32PrimitivesVersion>4.3.0</MicrosoftWin32PrimitivesVersion>
103103
<runtimenativeSystemIOPortsVersion>5.0.0-alpha.1.19563.3</runtimenativeSystemIOPortsVersion>
104104
<!-- Runtime-Assets dependencies -->
105-
<SystemComponentModelTypeConverterTestDataVersion>5.0.0-beta.20364.1</SystemComponentModelTypeConverterTestDataVersion>
106-
<SystemDrawingCommonTestDataVersion>5.0.0-beta.20364.1</SystemDrawingCommonTestDataVersion>
107-
<SystemIOCompressionTestDataVersion>5.0.0-beta.20364.1</SystemIOCompressionTestDataVersion>
108-
<SystemIOPackagingTestDataVersion>5.0.0-beta.20364.1</SystemIOPackagingTestDataVersion>
109-
<SystemNetTestDataVersion>5.0.0-beta.20364.1</SystemNetTestDataVersion>
110-
<SystemPrivateRuntimeUnicodeDataVersion>5.0.0-beta.20364.1</SystemPrivateRuntimeUnicodeDataVersion>
111-
<SystemSecurityCryptographyX509CertificatesTestDataVersion>5.0.0-beta.20364.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
112-
<SystemWindowsExtensionsTestDataVersion>5.0.0-beta.20364.1</SystemWindowsExtensionsTestDataVersion>
105+
<SystemComponentModelTypeConverterTestDataVersion>5.0.0-beta.20377.1</SystemComponentModelTypeConverterTestDataVersion>
106+
<SystemDrawingCommonTestDataVersion>5.0.0-beta.20377.1</SystemDrawingCommonTestDataVersion>
107+
<SystemIOCompressionTestDataVersion>5.0.0-beta.20377.1</SystemIOCompressionTestDataVersion>
108+
<SystemIOPackagingTestDataVersion>5.0.0-beta.20377.1</SystemIOPackagingTestDataVersion>
109+
<SystemNetTestDataVersion>5.0.0-beta.20377.1</SystemNetTestDataVersion>
110+
<SystemPrivateRuntimeUnicodeDataVersion>5.0.0-beta.20377.1</SystemPrivateRuntimeUnicodeDataVersion>
111+
<SystemSecurityCryptographyX509CertificatesTestDataVersion>5.0.0-beta.20377.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
112+
<SystemWindowsExtensionsTestDataVersion>5.0.0-beta.20377.1</SystemWindowsExtensionsTestDataVersion>
113113
<!-- Standard dependencies -->
114114
<NETStandardLibraryVersion>2.2.0-prerelease.19564.1</NETStandardLibraryVersion>
115115
<NetStandardLibrary20Version>2.0.3</NetStandardLibrary20Version>
@@ -133,9 +133,9 @@
133133
<RefOnlyNugetProjectModelVersion>4.9.4</RefOnlyNugetProjectModelVersion>
134134
<RefOnlyNugetPackagingVersion>4.9.4</RefOnlyNugetPackagingVersion>
135135
<!-- Testing -->
136-
<MicrosoftNETTestSdkVersion>16.8.0-preview-20200720-01</MicrosoftNETTestSdkVersion>
137-
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.20352.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
138-
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.20352.3</MicrosoftDotNetXHarnessCLIVersion>
136+
<MicrosoftNETTestSdkVersion>16.8.0-preview-20200730-02</MicrosoftNETTestSdkVersion>
137+
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.20380.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
138+
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.20380.1</MicrosoftDotNetXHarnessCLIVersion>
139139
<XUnitVersion>2.4.1</XUnitVersion>
140140
<XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion>
141141
<CoverletCollectorVersion>1.3.0</CoverletCollectorVersion>
@@ -146,7 +146,7 @@
146146
<!-- Docs -->
147147
<MicrosoftPrivateIntellisenseVersion>3.0.0-preview-20200715.1</MicrosoftPrivateIntellisenseVersion>
148148
<!-- ILLink -->
149-
<MicrosoftNETILLinkTasksVersion>5.0.0-preview.3.20374.1</MicrosoftNETILLinkTasksVersion>
149+
<MicrosoftNETILLinkTasksVersion>5.0.0-preview.3.20378.1</MicrosoftNETILLinkTasksVersion>
150150
<!-- ICU -->
151151
<MicrosoftNETCoreRuntimeICUTransportVersion>5.0.0-preview.8.20378.2</MicrosoftNETCoreRuntimeICUTransportVersion>
152152
<!-- Mono LLVM -->

‎eng/common/cross/toolchain.cmake

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -127,29 +127,40 @@ endif()
127127

128128
# Specify link flags
129129

130+
function(add_toolchain_linker_flag Flag)
131+
set(Config "${ARGV1}")
132+
set(CONFIG_SUFFIX "")
133+
if (NOT Config STREQUAL "")
134+
set(CONFIG_SUFFIX "_${Config}")
135+
endif()
136+
set("CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}" "${CMAKE_EXE_LINKER_FLAGS${CONFIG_SUFFIX}} ${Flag}" PARENT_SCOPE)
137+
set("CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}" "${CMAKE_SHARED_LINKER_FLAGS${CONFIG_SUFFIX}} ${Flag}" PARENT_SCOPE)
138+
endfunction()
139+
140+
130141
if(TARGET_ARCH_NAME STREQUAL "armel")
131142
if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only
132-
add_link_options("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
133-
add_link_options("-L${CROSS_ROOTFS}/lib")
134-
add_link_options("-L${CROSS_ROOTFS}/usr/lib")
135-
add_link_options("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
143+
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
144+
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib")
145+
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib")
146+
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}")
136147
endif()
137148
elseif(TARGET_ARCH_NAME STREQUAL "arm64")
138149
if(DEFINED TIZEN_TOOLCHAIN) # For Tizen only
139-
add_link_options("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
140-
add_link_options("-L${CROSS_ROOTFS}/lib64")
141-
add_link_options("-L${CROSS_ROOTFS}/usr/lib64")
142-
add_link_options("-L${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
143-
144-
add_link_options("-Wl,--rpath-link=${CROSS_ROOTFS}/lib64")
145-
add_link_options("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
146-
add_link_options("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
150+
add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
151+
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64")
152+
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64")
153+
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
154+
155+
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib64")
156+
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
157+
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
147158
endif()
148159
elseif(TARGET_ARCH_NAME STREQUAL "x86")
149-
add_link_options(-m32)
160+
add_toolchain_linker_flag(-m32)
150161
elseif(ILLUMOS)
151-
add_link_options("-L${CROSS_ROOTFS}/lib/amd64")
152-
add_link_options("-L${CROSS_ROOTFS}/usr/amd64/lib")
162+
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib/amd64")
163+
add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/amd64/lib")
153164
endif()
154165

155166
# Specify compile options

‎global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
"python3": "3.7.1"
1313
},
1414
"msbuild-sdks": {
15-
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20372.2",
16-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20364.3",
17-
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20364.3",
18-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20364.3",
15+
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20374.1",
16+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20374.1",
17+
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20374.1",
18+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20374.1",
1919
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
2020
"Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4",
2121
"Microsoft.Build.NoTargets": "1.0.53",

0 commit comments

Comments
 (0)