Skip to content

[main] Update dependencies from dotnet/installer #7836

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
merged 9 commits into from
Mar 4, 2023
Merged

[main] Update dependencies from dotnet/installer #7836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
15273a0
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Feb 28, 2023
29210c0
Keep $(DotNetMonoManifestVersionBand) on preview.2
jonathanpeppers Feb 28, 2023
ab6d581
Keep $(DotNetEmscriptenManifestVersionBand) on preview.2
jonathanpeppers Feb 28, 2023
bb56e73
Changes for Microsoft.DotNet.Cecil
jonathanpeppers Mar 1, 2023
98660a5
Update BuildReleaseArm64XFormsDotNet.apkdesc
jonathanpeppers Mar 1, 2023
a01cd5e
Merge branch 'main' into darc-main-670f8187-43c7-4e90-bbf2-cac5d0c4dc1e
jonathanpeppers Mar 1, 2023
9672c37
Update to MSBuild.StructuredLogger 2.1.787
jonathanpeppers Mar 2, 2023
5f6bd52
Merge branch 'main' into darc-main-670f8187-43c7-4e90-bbf2-cac5d0c4dc1e
jonathanpeppers Mar 2, 2023
adcbea6
Update BuildReleaseArm64XFormsDotNet.apkdesc
jonathanpeppers Mar 3, 2023
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
1 change: 1 addition & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" protocolVersion="3" />
<add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
<add key="dotnet8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8/nuget/v3/index.json" />
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
<!-- This is needed (currently) for the Xamarin.Android.Deploy.Installer dependency, getting the installer -->
<!-- Android binary, to support delta APK install -->
<add key="xamarin.android util" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/Xamarin.Android/nuget/v3/index.json" />
Expand Down
16 changes: 10 additions & 6 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.2.23123.10">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.3.23128.1">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>e3ab0b5b8c29d8d882ab1bfe6a5a99a703622c7e</Sha>
<Sha>632ddca23b8ec1393a1ec26607650236290276f1</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.2.23123.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-preview.2.23127.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74</Sha>
<Sha>2bdc3cb8dd3500aa2b3a51b558782560b26b5973</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.2.23123.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.0-preview.2.23127.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>ff7c19f266c835e3694a088c4a9e4e5a1ffb1b74</Sha>
<Sha>2bdc3cb8dd3500aa2b3a51b558782560b26b5973</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100-preview.2" Version="8.0.0-preview.2.23113.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>d7ff0aa47c680be543905cc1410e2f62b54dfefe</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.4-alpha.23113.1" CoherentParentDependency="Microsoft.NET.ILLink.Tasks">
<Uri>https://github.com/dotnet/cecil</Uri>
<Sha>68e0c35d0b4b6651b9a062a52e7dd694d7a43927</Sha>
</Dependency>
<Dependency Name="System.IO.Hashing" Version="8.0.0-alpha.1.23080.2" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9529803ae29c2804880c6bd8ca710b8c037cb498</Sha>
Expand Down
11 changes: 6 additions & 5 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.2.23123.10</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.2.23123.4</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.2.23123.4</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-preview.3.23128.1</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-preview.2.23127.4</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-preview.2.23127.4</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview2Version>8.0.0-preview.2.23113.1</MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview2Version>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100preview2Version)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineTasksPackageVersion>7.0.100-rc.1.22410.7</MicrosoftTemplateEngineTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.4-alpha.23113.1</MicrosoftDotNetCecilPackageVersion>
<SystemIOHashingPackageVersion>8.0.0-alpha.1.23080.2</SystemIOHashingPackageVersion>
</PropertyGroup>
<PropertyGroup>
Expand All @@ -18,7 +19,7 @@
<DotNetSdkManifestsFolder>$(DotNetPreviewVersionBand)</DotNetSdkManifestsFolder>
<!-- NOTE: sometimes we hardcode these when transitioning to new version bands -->
<DotNetAndroidManifestVersionBand>$(DotNetPreviewVersionBand)</DotNetAndroidManifestVersionBand>
<DotNetMonoManifestVersionBand>$(DotNetPreviewVersionBand)</DotNetMonoManifestVersionBand>
<DotNetEmscriptenManifestVersionBand>$(DotNetPreviewVersionBand)</DotNetEmscriptenManifestVersionBand>
<DotNetMonoManifestVersionBand>8.0.100-preview.2</DotNetMonoManifestVersionBand>
<DotNetEmscriptenManifestVersionBand>8.0.100-preview.2</DotNetEmscriptenManifestVersionBand>
</PropertyGroup>
</Project>
1 change: 0 additions & 1 deletion src/Microsoft.Android.Sdk.ILLink/Microsoft.Android.Sdk.ILLink.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
<OutputPath>$(MicrosoftAndroidSdkOutDir)</OutputPath>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Mono.Cecil" Version="$(MonoCecilVersion)" />
<PackageReference Include="Microsoft.NET.ILLink" Version="$(MicrosoftNETILLinkTasksPackageVersion)" />
<ProjectReference Include="..\..\external\Java.Interop\src\Java.Interop.Export\Java.Interop.Export.csproj" />
<ProjectReference Include="..\Xamarin.Android.Build.Tasks\Xamarin.Android.Build.Tasks.csproj" ReferenceOutputAssembly="False" />
Expand Down
82 changes: 41 additions & 41 deletions ...ild.Tasks/Tests/Xamarin.ProjectTools/Resources/Base/BuildReleaseArm64XFormsDotNet.apkdesc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@
"Size": 7313
},
"assemblies/Java.Interop.dll": {
"Size": 66562
"Size": 66563
},
"assemblies/Mono.Android.dll": {
"Size": 444972
"Size": 445325
},
"assemblies/Mono.Android.Runtime.dll": {
"Size": 5822
"Size": 5895
},
"assemblies/mscorlib.dll": {
"Size": 3866
"Size": 3868
},
"assemblies/netstandard.dll": {
"Size": 5579
"Size": 5580
},
"assemblies/rc.bin": {
"Size": 1182
Expand All @@ -32,109 +32,109 @@
"Size": 11561
},
"assemblies/System.Collections.dll": {
"Size": 15271
"Size": 15405
},
"assemblies/System.Collections.NonGeneric.dll": {
"Size": 7499
"Size": 7501
},
"assemblies/System.ComponentModel.dll": {
"Size": 1973
},
"assemblies/System.ComponentModel.Primitives.dll": {
"Size": 2595
"Size": 2596
},
"assemblies/System.ComponentModel.TypeConverter.dll": {
"Size": 6081
"Size": 6083
},
"assemblies/System.Console.dll": {
"Size": 6623
},
"assemblies/System.Core.dll": {
"Size": 1992
"Size": 1994
},
"assemblies/System.Diagnostics.TraceSource.dll": {
"Size": 6591
"Size": 6590
},
"assemblies/System.dll": {
"Size": 2347
"Size": 2349
},
"assemblies/System.Drawing.dll": {
"Size": 2032
"Size": 2034
},
"assemblies/System.Drawing.Primitives.dll": {
"Size": 12010
"Size": 12011
},
"assemblies/System.IO.Compression.Brotli.dll": {
"Size": 11871
"Size": 11031
},
"assemblies/System.IO.Compression.dll": {
"Size": 16858
"Size": 15983
},
"assemblies/System.IO.IsolatedStorage.dll": {
"Size": 10011
"Size": 10013
},
"assemblies/System.Linq.dll": {
"Size": 19453
"Size": 19455
},
"assemblies/System.Linq.Expressions.dll": {
"Size": 164141
"Size": 164140
},
"assemblies/System.Net.Http.dll": {
"Size": 66153
"Size": 65497
},
"assemblies/System.Net.Primitives.dll": {
"Size": 22487
"Size": 22480
},
"assemblies/System.Net.Requests.dll": {
"Size": 3630
"Size": 3632
},
"assemblies/System.ObjectModel.dll": {
"Size": 8154
"Size": 8155
},
"assemblies/System.Private.CoreLib.dll": {
"Size": 814322
"Size": 814504
},
"assemblies/System.Private.DataContractSerialization.dll": {
"Size": 192370
"Size": 192382
},
"assemblies/System.Private.Uri.dll": {
"Size": 42897
"Size": 42896
},
"assemblies/System.Private.Xml.dll": {
"Size": 216180
"Size": 216178
},
"assemblies/System.Private.Xml.Linq.dll": {
"Size": 16673
"Size": 16674
},
"assemblies/System.Runtime.dll": {
"Size": 2774
"Size": 2776
},
"assemblies/System.Runtime.InteropServices.dll": {
"Size": 3760
"Size": 3762
},
"assemblies/System.Runtime.Serialization.dll": {
"Size": 1950
"Size": 1952
},
"assemblies/System.Runtime.Serialization.Formatters.dll": {
"Size": 2517
"Size": 2518
},
"assemblies/System.Runtime.Serialization.Primitives.dll": {
"Size": 3802
"Size": 3804
},
"assemblies/System.Security.Cryptography.dll": {
"Size": 7781
"Size": 7776
},
"assemblies/System.Text.RegularExpressions.dll": {
"Size": 157123
"Size": 157124
},
"assemblies/System.Xml.dll": {
"Size": 1839
"Size": 1841
},
"assemblies/System.Xml.Linq.dll": {
"Size": 1864
"Size": 1866
},
"assemblies/UnnamedProject.dll": {
"Size": 5286
"Size": 5294
},
"assemblies/Xamarin.AndroidX.Activity.dll": {
"Size": 5867
Expand Down Expand Up @@ -209,10 +209,10 @@
"Size": 93552
},
"lib/arm64-v8a/libmonodroid.so": {
"Size": 380656
"Size": 380736
},
"lib/arm64-v8a/libmonosgen-2.0.so": {
"Size": 3106808
"Size": 3107296
},
"lib/arm64-v8a/libSystem.IO.Compression.Native.so": {
"Size": 723840
Expand All @@ -224,7 +224,7 @@
"Size": 154904
},
"lib/arm64-v8a/libxamarin-app.so": {
"Size": 333840
"Size": 333880
},
"META-INF/android.support.design_material.version": {
"Size": 12
Expand Down
2 changes: 1 addition & 1 deletion tests/MSBuildDeviceIntegration/MSBuildDeviceIntegration.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

<ItemGroup>
<PackageReference Include="NodaTime" Version="2.4.5" />
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.758" />
<PackageReference Include="MSBuild.StructuredLogger" Version="2.1.787" />
<PackageReference Include="ICSharpCode.Decompiler" Version="7.2.1.6856" />
</ItemGroup>

Expand Down