Skip to content

[main] Update dependencies from dotnet/runtime #28584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
agocke merged 14 commits into from
Oct 20, 2022
+47 −42
Merged

[main] Update dependencies from dotnet/runtime #28584

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
84ba489
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Oct 14, 2022
cad76db
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Oct 15, 2022
c764eef
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Oct 16, 2022
face93b
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Oct 17, 2022
d4b914a
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Oct 18, 2022
8068c7c
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Oct 19, 2022
96af8be
Disabling linux testing until runtime #75468 is fixed
LakshanF Oct 19, 2022
f4657e7
removed debugging artifact
LakshanF Oct 19, 2022
df2d37d
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Oct 20, 2022
d4aa91a
work around linux issue by using standard c lib
LakshanF Oct 20, 2022
6c1c132
Merge branch 'darc-main-ea02237a-f937-463c-a5a2-ef46b098f7a2' of http…
LakshanF Oct 20, 2022
eada16e
Update src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublish…
LakshanF Oct 20, 2022
621832c
FB
LakshanF Oct 20, 2022
c8b948c
Set LinkStandardCPlusPlusLibrary automatically on non-windows
agocke Oct 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Disabling linux testing until runtime #75468 is fixed
  • Loading branch information
@LakshanF
LakshanF committed Oct 19, 2022
commit 96af8beb8ed54aa8c4ce5832f3790d0905c0368d
50 changes: 37 additions & 13 deletions src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,9 @@ public GivenThatWeWantToPublishAnAotApp(ITestOutputHelper log) : base(log)
[InlineData(ToolsetInfo.CurrentTargetFramework)]
public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_enabled(string targetFramework)
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
// Enable Linux after this issue is fixed
// https://github.com/dotnet/runtime/issues/75468
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))// || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
var projectName = "HellowWorldNativeAotApp";
var rid = EnvironmentInfo.GetCompatibleRid(targetFramework);
Expand Down Expand Up @@ -118,7 +120,9 @@ public void NativeAot_app_runs_in_debug_with_no_config_when_PublishAot_is_enable
{
// NativeAOT application publish directory should not contain any <App>.deps.json or <App>.runtimeconfig.json
// The test writes a key-value pair to the runtimeconfig file and checks that the app can access it
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
// Enable Linux after this issue is fixed
// https://github.com/dotnet/runtime/issues/75468
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))// || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
var projectName = "NativeAotAppForConfigTestDbg";
var rid = EnvironmentInfo.GetCompatibleRid(targetFramework);
Expand All @@ -141,7 +145,7 @@ public void NativeAot_app_runs_in_debug_with_no_config_when_PublishAot_is_enable

var publishCommand = new PublishCommand(Log, Path.Combine(testAsset.TestRoot, testProject.Name));
publishCommand
.Execute($"/p:RuntimeIdentifier={rid}")
.Execute($"/p:RuntimeIdentifier={rid}", @"/bl:C:\Work\Core\Test\NativeAOT\10_19\laks-pub.binlog")
.Should().Pass();

var publishDirectory = publishCommand.GetOutputDirectory(targetFramework: targetFramework, configuration: projectConfiguration, runtimeIdentifier: rid).FullName;
Expand Down Expand Up @@ -174,7 +178,9 @@ public void NativeAot_app_runs_in_release_with_no_config_when_PublishAot_is_enab
{
// NativeAOT application publish directory should not contain any <App>.deps.json or <App>.runtimeconfig.json
// The test writes a key-value pair to the runtimeconfig file and checks that the app can access it
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
// Enable Linux after this issue is fixed
// https://github.com/dotnet/runtime/issues/75468
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))// || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
var projectName = "NativeAotAppForConfigTestRel";
var rid = EnvironmentInfo.GetCompatibleRid(targetFramework);
Expand Down Expand Up @@ -230,7 +236,9 @@ public void NativeAot_app_builds_with_config_when_PublishAot_is_enabled(string t
{
// NativeAOT application publish directory should not contain any <App>.deps.json or <App>.runtimeconfig.json
// But build step should preserve these files
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
// Enable Linux after this issue is fixed
// https://github.com/dotnet/runtime/issues/75468
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))// || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
var projectName = "NativeAotAppForConfigTest";
var rid = EnvironmentInfo.GetCompatibleRid(targetFramework);
Expand Down Expand Up @@ -263,7 +271,9 @@ public void NativeAot_app_builds_with_config_when_PublishAot_is_enabled(string t
[InlineData(ToolsetInfo.CurrentTargetFramework)]
public void NativeAot_hw_runs_with_PackageReference_PublishAot_is_enabled(string targetFramework)
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
// Enable Linux after this issue is fixed
// https://github.com/dotnet/runtime/issues/75468
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))// || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
var projectName = "HellowWorldNativeAotApp";
var rid = EnvironmentInfo.GetCompatibleRid(targetFramework);
Expand Down Expand Up @@ -314,7 +324,9 @@ public void NativeAot_hw_runs_with_PackageReference_PublishAot_is_enabled(string
[InlineData(ToolsetInfo.CurrentTargetFramework)]
public void NativeAot_hw_runs_with_PackageReference_PublishAot_is_empty(string targetFramework)
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
// Enable Linux after this issue is fixed
// https://github.com/dotnet/runtime/issues/75468
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))// || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
var projectName = "HellowWorldNativeAotApp";
var rid = EnvironmentInfo.GetCompatibleRid(targetFramework);
Expand Down Expand Up @@ -514,7 +526,9 @@ public void Only_Aot_warnings_are_produced_if_EnableAotAnalyzer_is_set(string ta
[InlineData(ToolsetInfo.CurrentTargetFramework)]
public void Requires_analyzers_produce_warnings_without_PublishAot_being_set(string targetFramework)
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
// Enable Linux after this issue is fixed
// https://github.com/dotnet/runtime/issues/75468
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))// || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
var projectName = "WarningAppWithRequiresAnalyzers";
var rid = EnvironmentInfo.GetCompatibleRid(targetFramework);
Expand Down Expand Up @@ -544,7 +558,9 @@ public void Requires_analyzers_produce_warnings_without_PublishAot_being_set(str
[InlineData(ToolsetInfo.CurrentTargetFramework)]
public void NativeAot_compiler_runs_when_PublishAot_is_enabled(string targetFramework)
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
// Enable Linux after this issue is fixed
// https://github.com/dotnet/runtime/issues/75468
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))// || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
var projectName = "WarningAppWithPublishAot";
var rid = EnvironmentInfo.GetCompatibleRid(targetFramework);
Expand Down Expand Up @@ -583,7 +599,9 @@ public void NativeAot_compiler_runs_when_PublishAot_is_enabled(string targetFram
[InlineData(ToolsetInfo.CurrentTargetFramework)]
public void Warnings_are_generated_even_with_analyzers_disabled(string targetFramework)
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
// Enable Linux after this issue is fixed
// https://github.com/dotnet/runtime/issues/75468
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))// || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
var projectName = "WarningAppWithPublishAotAnalyzersDisabled";
var rid = EnvironmentInfo.GetCompatibleRid(targetFramework);
Expand Down Expand Up @@ -624,7 +642,9 @@ public void Warnings_are_generated_even_with_analyzers_disabled(string targetFra
[InlineData(ToolsetInfo.CurrentTargetFramework)]
public void NativeAotStaticLib_only_runs_when_switch_is_enabled(string targetFramework)
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
// Enable Linux after this issue is fixed
// https://github.com/dotnet/runtime/issues/75468
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))// || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
var projectName = "AotStaticLibraryPublish";
var rid = EnvironmentInfo.GetCompatibleRid(targetFramework);
Expand Down Expand Up @@ -655,7 +675,9 @@ public void NativeAotStaticLib_only_runs_when_switch_is_enabled(string targetFra
[InlineData(ToolsetInfo.CurrentTargetFramework)]
public void NativeAotSharedLib_only_runs_when_switch_is_enabled(string targetFramework)
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
// Enable Linux after this issue is fixed
// https://github.com/dotnet/runtime/issues/75468
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))// || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
var projectName = "AotSharedLibraryPublish";
var rid = EnvironmentInfo.GetCompatibleRid(targetFramework);
Expand Down Expand Up @@ -686,7 +708,9 @@ public void NativeAotSharedLib_only_runs_when_switch_is_enabled(string targetFra
[InlineData(ToolsetInfo.CurrentTargetFramework)]
public void It_publishes_with_implicit_rid_with_NativeAotApp(string targetFramework)
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
// Enable Linux after this issue is fixed
// https://github.com/dotnet/runtime/issues/75468
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))// || RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
{
var projectName = "ImplicitRidNativeAotApp";
var testProject = CreateHelloWorldTestProject(targetFramework, projectName, true);
Expand Down