Skip to content

Commit

Permalink
Revert "Bump to dotnet/installer@d25a3bb 8.0.100-preview.2.23105.6 (d…
Browse files Browse the repository at this point in the history
…otnet#7769)"

Context: dotnet/runtime#82597

This reverts commit 6cd0d38.

We need to do it because a recent update to the `Microsoft.NET.ILLink`
package broke our build:

   Microsoft.Android.Sdk.ILLink.csproj : error NU1202: Package Microsoft.NET.ILLink 8.0.0-preview.2.23123.5 is not compatible with net7.0 (.NETCoreApp,Version=v7.0). Package Microsoft.NET.ILLink 8.0.0-preview.2.23123.5 supports: net8.0 (.NETCoreApp,Version=v8.0)

This happened because the version of `Microsoft.NET.ILLink` that
we have configured in `en/Version.Details.xml` was removed from
the dotnet8 feed and the closest matching version is installed instead.

An attempt to fix it was to switch the `Microsoft.Android.Sdk.ILLink`
project back to `net8.0` but, alas, the new `Microsoft.NET.ILLink` package
version misses dependency on Cecil, also causing our build to fail:

   src/Microsoft.Android.Sdk.ILLink/ApplyPreserveAttribute.cs(9,12): error CS0234: The type or namespace name 'Cecil' does not exist in the namespace 'Mono'
   src/Xamarin.Android.Build.Tasks/Linker/MonoDroid.Tuner/LinkDesignerBase.cs(161,41): error CS0246: The type or namespace name 'MethodDefinition' could not be found
   ...
    626 Warning(s)
    359 Error(s)

Reverting 6cd0d38 puts as back on the `alpha1`
release of net8 and fixes the build until we have a real solution available.
  • Loading branch information
grendello committed Feb 24, 2023
1 parent f93474a commit c8b2cc0
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
18 changes: 9 additions & 9 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.2.23107.13">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-alpha.1.23080.11">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>f05478ba9a4026e95306d3f8de59c70cfc0e60ce</Sha>
<Sha>dec120944450abb58bc07a2fcdae2f4383bfd6bf</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.2.23106.6" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>fe4760cf04dee615948848955978e6d7430982a7</Sha>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.100-1.23067.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/linker</Uri>
<Sha>c790896f128957acd2999208f44f09ae1e826c8c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.2.23106.6" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-alpha.1.23080.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>fe4760cf04dee615948848955978e6d7430982a7</Sha>
<Sha>9529803ae29c2804880c6bd8ca710b8c037cb498</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100-preview.2" Version="8.0.0-preview.2.23081.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100-alpha.1" Version="8.0.0-alpha.1.23077.4" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>fd5a0d1b19bf0a96f6b4423150921542b0b9a90d</Sha>
<Sha>0fe864fc71191ff4ee18e59ef0af2929ca367a11</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
10 changes: 5 additions & 5 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.2.23107.13</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.2.23106.6</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.2.23106.6</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-alpha.1.23080.11</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.100-1.23067.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-alpha.1.23080.2</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview2Version>8.0.0-preview.2.23081.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview2Version>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview2Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100alpha1Version>8.0.0-alpha.1.23077.4</MicrosoftNETWorkloadEmscriptenCurrentManifest80100alpha1Version>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100alpha1Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down

0 comments on commit c8b2cc0

Please sign in to comment.