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/installer #11175

Merged
merged 28 commits into from
Apr 20, 2021
Merged

[main] Update dependencies from dotnet/installer #11175

Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
120ef2f
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Apr 9, 2021
fad05ba
Merge branch 'main' into darc-main-38ef8300-a7b5-4ebc-9dd4-75e9ac8721ed
dalexsoto Apr 9, 2021
5e184ca
Merge branch 'main' into darc-main-38ef8300-a7b5-4ebc-9dd4-75e9ac8721ed
dalexsoto Apr 9, 2021
8d87901
Merge branch 'main' into darc-main-38ef8300-a7b5-4ebc-9dd4-75e9ac8721ed
mandel-macaque Apr 10, 2021
6b2203c
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Apr 10, 2021
04ceb7d
Merge branch 'main' into darc-main-38ef8300-a7b5-4ebc-9dd4-75e9ac8721ed
dalexsoto Apr 11, 2021
8a477c8
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Apr 11, 2021
27e8d31
same P4 specific fix as ccb43cba563366b5a9e41b3f98cd140a86342317
Apr 12, 2021
a1242da
Merge branch 'main' into darc-main-38ef8300-a7b5-4ebc-9dd4-75e9ac8721ed
spouliot Apr 13, 2021
2d9d5da
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Apr 13, 2021
bf96270
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Apr 14, 2021
29b10a5
Merge branch 'main' into darc-main-38ef8300-a7b5-4ebc-9dd4-75e9ac8721ed
spouliot Apr 14, 2021
56bb3d7
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Apr 14, 2021
ed3ac89
Update to new package names
Apr 15, 2021
44e02cf
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Apr 15, 2021
8ebf77b
Merge branch 'main' into darc-main-38ef8300-a7b5-4ebc-9dd4-75e9ac8721ed
dalexsoto Apr 15, 2021
a22402e
Fix build (path changed to include '.mono')
Apr 15, 2021
d8a6abe
Merge branch 'main' into darc-main-38ef8300-a7b5-4ebc-9dd4-75e9ac8721ed
Apr 16, 2021
9a02e48
remove more '.mono' special case that are not needed anymore
Apr 16, 2021
0ac9320
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Apr 16, 2021
106defd
Fix building apps (it now finds the native libs)
Apr 16, 2021
c837f58
Add back IsTrimmable (or nothing gets linked)
Apr 16, 2021
50e7fcc
Merge branch 'main' into darc-main-38ef8300-a7b5-4ebc-9dd4-75e9ac8721ed
spouliot Apr 17, 2021
898b764
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Apr 19, 2021
e146bd0
Keep downloading the CoreCLR runtime packs.
rolfbjarne Apr 19, 2021
1e376e7
[runtime] Adjust the build to link with the correct runtime library f…
rolfbjarne Apr 19, 2021
5fdd4e2
[tests][monotouch-test] Ignore NSTimeZoneTest / All_28300 on dotnet a…
Apr 19, 2021
52ca962
[dotnet][msbuild] Add more (missing) '\'
Apr 19, 2021
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
7 changes: 1 addition & 6 deletions builds/package-download/download-packages.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,8 @@
<!-- Download any runtime packs as specified using the PackageRuntimeIdentifiers property -->
<PackageRuntimeIdentifiers Include="$(PackageRuntimeIdentifiers.Split(' '))" />

<!-- Download the mono osx pack as well -->
<!-- I wasn't able to figure out how to only do this if 'osx-x64'/'osx-arm64' is already included -->
<PackageRuntimeIdentifiers Include="Mono.osx-x64" />
<PackageRuntimeIdentifiers Include="Mono.osx-arm64" />

<!-- download the runtime packs -->
<PackageDownload Include="@(PackageRuntimeIdentifiers -> 'Microsoft.NETCore.App.Runtime.%(Identity)')" Version="[$(BundledNETCorePlatformsPackageVersion)]" />
<PackageDownload Include="@(PackageRuntimeIdentifiers -> 'Microsoft.NETCore.App.Runtime.Mono.%(Identity)')" Version="[$(BundledNETCorePlatformsPackageVersion)]" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this doesn't download the CoreCLR version anymore (which we need for macOS). However, that should make the build fail, which it apparently doesn't, so IDK?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

were any test are enabled ? maybe it silently fail ? 🤷‍♂️


<!-- download the reference assemblies -->
<PackageDownload Include="microsoft.netcore.app.ref" Version="[$(BundledNETCorePlatformsPackageVersion)]" />
Expand Down
23 changes: 3 additions & 20 deletions dotnet/targets/Xamarin.Shared.Sdk.DefaultItems.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@

<!-- Don't include default Compile items for binding projects, because that would pick up ApiDefinition.cs and StructsAndEnums.cs -->
<EnableDefaultCompileItems Condition=" '$(IsBindingProject)' == 'true' ">false</EnableDefaultCompileItems>

<UseMonoRuntime Condition=" '$(UseMonoRuntime)' == '' And '$(_XamarinRuntime)' != 'CoreCLR' ">true</UseMonoRuntime>
<UseMonoRuntime Condition=" '$(UseMonoRuntime)' == '' And '$(_XamarinRuntime)' == 'CoreCLR' ">false</UseMonoRuntime>
</PropertyGroup>

<!-- Architecture -->
Expand Down Expand Up @@ -85,24 +88,4 @@
<FrameworkReference Include="Microsoft.$(_PlatformName)" IsImplicitlyDefined="true" Pack="false" PrivateAssets="All" />
</ItemGroup>

<!-- This a workaround until https://github.com/dotnet/runtime/issues/34193 is fixed and a proper solution can be implemented.
The problem is that by default we get the 'Microsoft.NETCore.App.Runtime.osx-x64' runtime pack (the core clr version), when we want the 'Microsoft.NETCore.App.Mono.Runtime.osx-x64' runtime pack.
This works around that by declaring a new known framework for mono's runtime pack, removing the default 'Microsoft.NETCore.App' framework reference, and adding the mono one.
-->
<ItemGroup Condition="'$(_PlatformName)' == 'macOS' And '$(_XamarinRuntime)' != 'CoreCLR'">
<KnownFrameworkReference Include="Microsoft.NETCore.App.Mono"
TargetFramework="net6.0"
RuntimeFrameworkName="Microsoft.NETCore.App.Mono"
DefaultRuntimeFrameworkVersion="$(BundledNETCorePlatformsPackageVersion)"
LatestRuntimeFrameworkVersion="$(BundledNETCorePlatformsPackageVersion)"
TargetingPackName="Microsoft.NETCore.App.Ref"
TargetingPackVersion="$(BundledNETCorePlatformsPackageVersion)"
RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.Mono.**RID**"
RuntimePackRuntimeIdentifiers="osx-x64;osx-arm64"
IsTrimmable="true"
/>
<FrameworkReference Remove="Microsoft.NETCore.App" />
<FrameworkReference Include="Microsoft.NETCore.App.Mono" IsImplicitlyDefined="true" Pack="false" PrivateAssets="All" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions dotnet/targets/Xamarin.Shared.Sdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@

<Target Name="_ComputeFrameworkVariables" DependsOnTargets="ResolveRuntimePackAssets">
<PropertyGroup>
<_PackageIdInfix Condition="'$(_XamarinRuntime)' != 'CoreCLR' And '$(_PlatformName)' == 'macOS'">Mono.</_PackageIdInfix>
<_PackageIdInfix Condition="'$(UseMonoRuntime)' == 'true'">Mono.</_PackageIdInfix>

<_MonoNugetPackageId>Microsoft.NETCore.App.Runtime.$(_PackageIdInfix)$(RuntimeIdentifier)</_MonoNugetPackageId>
</PropertyGroup>
Expand Down Expand Up @@ -699,7 +699,7 @@
Condition="('$(_SdkIsSimulator)' != 'false' Or '$(_PlatformName)' == 'macOS' Or '$(_PlatformName)' == 'MacCatalyst') And '%(Extension)' == '.dylib'" />
<ResolvedFileToPublish
Update="@(ResolvedFileToPublish)"
RelativePath="$([MSBuild]::MakeRelative($(MSBuildProjectDirectory)$(PublishDir),$(_AssemblyPublishDir)))%(Filename)%(Extension)"
RelativePath="$([MSBuild]::MakeRelative($(MSBuildProjectDirectory)$(PublishDir),$(_AssemblyPublishDir)))\%(Filename)%(Extension)"
Condition="'$(_PlatformName)' != 'macOS' And '$(InvariantGlobalization)' != 'true' And '%(Filename)%(Extension)' == 'icudt.dat'" />
</ItemGroup>
</Target>
Expand Down
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.3.21202.5">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="6.0.100-preview.4.21215.12">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>aee38a6dd446b512b1ae510d80d2ed1c1f24e79a</Sha>
<Sha>c1eb61ac8152d6777b0d685e37b32885fd37775d</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="6.0.100-preview.2.21212.1">
<Uri>https://github.com/mono/linker</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
@@ -1,7 +1,7 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.3.21202.5</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>6.0.100-preview.4.21215.12</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkPackageVersion>6.0.100-preview.2.21212.1</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>6.0.100-preview.2.21212.1</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>6.0.0-beta.21212.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
Expand Down
6 changes: 1 addition & 5 deletions runtime/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,13 +671,9 @@ $(foreach platform,$(DOTNET_PLATFORMS),$(foreach rid,$(DOTNET_$(platform)_RUNTIM
# https://github.com/dotnet/runtime/issues/48508
DOTNET_tvos-arm64_LIBDIR=$(TOP)/builds/mono-ios-sdk-destdir/ios-libs/tvos

# The runtime pack is different for macOS/Mono (it has '.Mono' at the end), so add a special case here.
DOTNET_osx-x64_LIBDIR=$(TOP)/builds/downloads/microsoft.netcore.app.runtime.mono.osx-x64/$(BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION)/runtimes/osx-x64/native
DOTNET_osx-arm64_LIBDIR=$(TOP)/builds/downloads/microsoft.netcore.app.runtime.mono.osx-arm64/$(BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION)/runtimes/osx-arm64/native

define DotNetLibXamarinTemplate

DOTNET$(6)_$(2)_LIBDIR ?= $$(TOP)/builds/downloads/microsoft.netcore.app.runtime.$(2)/$(BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION)/runtimes/$(2)/native
DOTNET$(6)_$(2)_LIBDIR ?= $$(TOP)/builds/downloads/microsoft.netcore.app.runtime.mono.$(2)/$(BUNDLED_NETCORE_PLATFORMS_PACKAGE_VERSION)/runtimes/$(2)/native
DOTNET$(6)_$(2)_DYLIB_FLAGS = $(DOTNET_$(1)_DYLIB_FLAGS) -Wl,-install_name,libxamarin$(5).dylib -framework Foundation -framework CFNetwork -lz -L$(abspath $(DOTNET$(6)_$(2)_LIBDIR))

DOTNET_$(2)_$(3)$(4)_OBJECTS = $$(patsubst %,.libs/$(1)/%$(5).$(3).o, $(MONOTOUCH_SOURCE_STEMS)) $$(patsubst %,.libs/$(1)/%$(5).$(3).o, $(MONOTOUCH_$(shell echo $(3) | tr a-z A-Z)_SOURCE_STEMS))
Expand Down