Skip to content
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

Jump to bottom

[main] Update dependencies from dotnet/linker #27186

Merged
merged 6 commits into from
Aug 16, 2022
Merged

[main] Update dependencies from dotnet/linker #27186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
407917d
Update dependencies from https://github.com/dotnet/linker build 20220…
dotnet-maestro[bot] Aug 15, 2022
71a972b
Update dependencies from https://github.com/dotnet/linker build 20220…
dotnet-maestro[bot] Aug 15, 2022
ce8a282
Update dependencies from https://github.com/dotnet/linker build 20220…
dotnet-maestro[bot] Aug 16, 2022
b41853f
Workaround for the floating version with a specific one
LakshanF Aug 16, 2022
c9c8b06
Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-6…
LakshanF Aug 16, 2022
115a448
updating the floating version to a fixed one on main test as well
LakshanF Aug 16, 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
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,19 +105,19 @@
<Uri>https://github.com/microsoft/vstest</Uri>
<Sha>ef0aa102e9c7d5cf55af06c2747d11e07d12b69a</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22415.1">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22415.4">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>33c3b2c60d0a2006162a6326db853fe5415439bd</Sha>
<Sha>6252a2194dd32911db2c0669fc818555687d5570</Sha>
<SourceBuild RepoName="linker" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.ILCompiler" Version="7.0.0-rc.1.22411.12">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>f52d8c59bb49360eb2cbeeb863c5856ebd62adda</Sha>
<SourceBuildTarball RepoName="runtime" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Analyzers" Version="7.0.100-1.22415.1">
<Dependency Name="Microsoft.NET.ILLink.Analyzers" Version="7.0.100-1.22415.4">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>33c3b2c60d0a2006162a6326db853fe5415439bd</Sha>
<Sha>6252a2194dd32911db2c0669fc818555687d5570</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="7.0.0-rc.1.22411.12">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/mono/linker -->
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22415.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22415.4</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksPackageVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down
12 changes: 6 additions & 6 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 @@ -272,7 +272,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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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);

Expand All @@ -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);

Expand Down