From 407917d62dc39a53f5974eaa5a82be7b64ace8b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 15 Aug 2022 21:20:11 +0000 Subject: [PATCH 1/5] Update dependencies from https://github.com/dotnet/linker build 20220815.2 Microsoft.NET.ILLink.Analyzers , Microsoft.NET.ILLink.Tasks From Version 7.0.100-1.22415.1 -> To Version 7.0.100-1.22415.2 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 80aa407d07f4..ad9d1371e6db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,9 +105,9 @@ https://github.com/microsoft/vstest ef0aa102e9c7d5cf55af06c2747d11e07d12b69a - + https://github.com/dotnet/linker - 33c3b2c60d0a2006162a6326db853fe5415439bd + c710e8af4224a3d0d2975ba5c2b09f0398ee2383 @@ -115,9 +115,9 @@ f52d8c59bb49360eb2cbeeb863c5856ebd62adda - + https://github.com/dotnet/linker - 33c3b2c60d0a2006162a6326db853fe5415439bd + c710e8af4224a3d0d2975ba5c2b09f0398ee2383 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4e22106e19c2..2c4ba7ac523b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,7 +85,7 @@ - 7.0.100-1.22415.1 + 7.0.100-1.22415.2 $(MicrosoftNETILLinkTasksPackageVersion) From 71a972bd2f827dc1015e0d1060dfa2a9e36437c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 15 Aug 2022 21:44:04 +0000 Subject: [PATCH 2/5] Update dependencies from https://github.com/dotnet/linker build 20220815.3 Microsoft.NET.ILLink.Analyzers , Microsoft.NET.ILLink.Tasks From Version 7.0.100-1.22415.1 -> To Version 7.0.100-1.22415.3 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad9d1371e6db..b5f509d80de9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,9 +105,9 @@ https://github.com/microsoft/vstest ef0aa102e9c7d5cf55af06c2747d11e07d12b69a - + https://github.com/dotnet/linker - c710e8af4224a3d0d2975ba5c2b09f0398ee2383 + 6b5bc03dbc6ca0553fac7dd6f36feefe09924bb8 @@ -115,9 +115,9 @@ f52d8c59bb49360eb2cbeeb863c5856ebd62adda - + https://github.com/dotnet/linker - c710e8af4224a3d0d2975ba5c2b09f0398ee2383 + 6b5bc03dbc6ca0553fac7dd6f36feefe09924bb8 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2c4ba7ac523b..34ed93e9f76c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,7 +85,7 @@ - 7.0.100-1.22415.2 + 7.0.100-1.22415.3 $(MicrosoftNETILLinkTasksPackageVersion) From ce8a282cd7a7f7b8acbeed74dd3bd8f4e7d74e3f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Aug 2022 02:56:20 +0000 Subject: [PATCH 3/5] Update dependencies from https://github.com/dotnet/linker build 20220815.4 Microsoft.NET.ILLink.Analyzers , Microsoft.NET.ILLink.Tasks From Version 7.0.100-1.22415.1 -> To Version 7.0.100-1.22415.4 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b5f509d80de9..591b008eb9a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -105,9 +105,9 @@ https://github.com/microsoft/vstest ef0aa102e9c7d5cf55af06c2747d11e07d12b69a - + https://github.com/dotnet/linker - 6b5bc03dbc6ca0553fac7dd6f36feefe09924bb8 + 6252a2194dd32911db2c0669fc818555687d5570 @@ -115,9 +115,9 @@ f52d8c59bb49360eb2cbeeb863c5856ebd62adda - + https://github.com/dotnet/linker - 6b5bc03dbc6ca0553fac7dd6f36feefe09924bb8 + 6252a2194dd32911db2c0669fc818555687d5570 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 34ed93e9f76c..68aed2511561 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,7 +85,7 @@ - 7.0.100-1.22415.3 + 7.0.100-1.22415.4 $(MicrosoftNETILLinkTasksPackageVersion) From b41853f54bc833bf887e90ccbbe118ec2e8a0155 Mon Sep 17 00:00:00 2001 From: Lakshan Fernando Date: Tue, 16 Aug 2022 08:43:12 -0700 Subject: [PATCH 4/5] Workaround for the floating version with a specific one --- .../GivenThatWeWantToPublishAnAotApp.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs index 07b7d06f841a..d85cdd3d383f 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs @@ -238,7 +238,7 @@ public void NativeAot_hw_runs_with_PackageReference_PublishAot_is_enabled(string testProject.AdditionalProperties["PublishAot"] = "true"; // This will add a reference to a package that will also be automatically imported by the SDK - testProject.PackageReferences.Add(new TestPackageReference("Microsoft.DotNet.ILCompiler", "7.0.0-*")); + testProject.PackageReferences.Add(new TestPackageReference("Microsoft.DotNet.ILCompiler", "7.0.0-rc.1.22416.1")); // Linux symbol files are embedded and require additional steps to be stripped to a separate file // assumes /bin (or /usr/bin) are in the PATH From 115a4482beb4584ab4f9f936114f54eea98631b2 Mon Sep 17 00:00:00 2001 From: Lakshan Fernando Date: Tue, 16 Aug 2022 10:13:08 -0700 Subject: [PATCH 5/5] updating the floating version to a fixed one on main test as well --- .../GivenThatWeWantToPublishAnAotApp.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs index c3068d714374..c674294f09e1 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs @@ -319,7 +319,7 @@ public void NativeAot_hw_runs_with_PackageReference_PublishAot_is_empty(string t var testProject = CreateHelloWorldTestProject(targetFramework, projectName, true); // This will add a reference to a package that will also be automatically imported by the SDK - testProject.PackageReferences.Add(new TestPackageReference("Microsoft.DotNet.ILCompiler", "7.0.0-*")); + testProject.PackageReferences.Add(new TestPackageReference("Microsoft.DotNet.ILCompiler", "7.0.0-rc.1.22416.1")); // Linux symbol files are embedded and require additional steps to be stripped to a separate file // assumes /bin (or /usr/bin) are in the PATH @@ -367,8 +367,8 @@ public void NativeAot_hw_runs_with_cross_PackageReference_PublishAot_is_enabled( testProject.AdditionalProperties["PublishAot"] = "true"; // This will add a reference to a package that will also be automatically imported by the SDK - testProject.PackageReferences.Add(new TestPackageReference("Microsoft.DotNet.ILCompiler", "7.0.0-*")); - testProject.PackageReferences.Add(new TestPackageReference("runtime.win-x64.Microsoft.DotNet.ILCompiler", "7.0.0-*")); + testProject.PackageReferences.Add(new TestPackageReference("Microsoft.DotNet.ILCompiler", "7.0.0-rc.1.22416.1")); + testProject.PackageReferences.Add(new TestPackageReference("runtime.win-x64.Microsoft.DotNet.ILCompiler", "7.0.0-rc.1.22416.1")); var testAsset = _testAssetsManager.CreateTestProject(testProject); @@ -391,8 +391,8 @@ public void NativeAot_hw_runs_with_cross_PackageReference_PublishAot_is_empty(st var testProject = CreateHelloWorldTestProject(targetFramework, projectName, true); // This will add a reference to a package that will also be automatically imported by the SDK - testProject.PackageReferences.Add(new TestPackageReference("Microsoft.DotNet.ILCompiler", "7.0.0-*")); - testProject.PackageReferences.Add(new TestPackageReference("runtime.win-x64.Microsoft.DotNet.ILCompiler", "7.0.0-*")); + testProject.PackageReferences.Add(new TestPackageReference("Microsoft.DotNet.ILCompiler", "7.0.0-rc.1.22416.1")); + testProject.PackageReferences.Add(new TestPackageReference("runtime.win-x64.Microsoft.DotNet.ILCompiler", "7.0.0-rc.1.22416.1")); var testAsset = _testAssetsManager.CreateTestProject(testProject);