Skip to content

[release/8.0.1xx-rc2] Update dependencies from dotnet/installer #8360

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 19 commits into from
Sep 26, 2023
Merged

[release/8.0.1xx-rc2] Update dependencies from dotnet/installer #8360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
211c377
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Sep 21, 2023
ba2d6fc
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Sep 22, 2023
bf8a633
dotnet/runtime 7.0.12
jonathanpeppers Sep 22, 2023
0f1f440
dotnet/runtime 6.0.23
jonathanpeppers Sep 22, 2023
1f8a122
Pass `-p:RestoreConfigFile` to `Java.Interop.sln`
jonathanpeppers Sep 22, 2023
f8d2c17
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Sep 23, 2023
f0ddfdc
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Sep 24, 2023
80e6fd1
Bump to xamarin/monodroid/main@6c16fb50
jonathanpeppers Sep 25, 2023
fdeac57
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Sep 25, 2023
6976437
Merge branch 'release/8.0.1xx-rc2' into darc-release/8.0.1xx-rc2-9f11…
jonathanpeppers Sep 25, 2023
4c2861e
Pass `-p:RestoreConfigFile` more places
jonathanpeppers Sep 25, 2023
ecd90af
Revert "Pass `-p:RestoreConfigFile` more places"
jonathanpeppers Sep 25, 2023
2c29c65
Revert "Pass `-p:RestoreConfigFile` to `Java.Interop.sln`"
jonathanpeppers Sep 25, 2023
f875c3d
Try `$(RestoreConfigFile)` in `*.override.props`
jonathanpeppers Sep 25, 2023
d3dc21d
$(RestoreAdditionalProjectSources) for the win?
jonathanpeppers Sep 25, 2023
01f4dc2
$(RestoreAdditionalProjectSources) in one more place
jonathanpeppers Sep 25, 2023
d34d4b0
DisableTransitiveFrameworkReferenceDownloads in tests
jonathanpeppers Aug 22, 2023
4cab7e3
Update DotNet.targets
jonathanpeppers Sep 25, 2023
ff6ca30
Update DotNet.targets
jonathanpeppers Sep 25, 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
2 changes: 1 addition & 1 deletion .external
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
xamarin/monodroid:main@c36049815ca04379194dd32f402f56beb5b992d3
xamarin/monodroid:main@6c16fb50a77cf7d5a040c67b0e970e090ba4ce6e
mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d
8 changes: 5 additions & 3 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@
<!-- 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" />
<!-- Added manually for dotnet/runtime 7.0.11 -->
<add key="darc-pub-dotnet-emsdk-fcd8602" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-fcd86021/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-0ece505" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-0ece5051/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 7.0.12 -->
<add key="darc-pub-dotnet-emsdk-9506882" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-95068821/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-26e0f82" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-26e0f822/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 6.0.23 -->
<add key="darc-pub-dotnet-runtime-301ba1e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-301ba1ee/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources />
</configuration>
17 changes: 16 additions & 1 deletion build-tools/scripts/DotNet.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,12 @@
<MauiWorkloadToInstall Condition=" '$(MauiWorkloadToInstall)' == '' ">maui-android</MauiWorkloadToInstall>
</PropertyGroup>

<ItemGroup>
<!-- Feeds for dotnet/runtime, to be passed to external/java.interop/external/xamarin-android-tools -->
<_RestoreAdditionalProjectSources Include="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-26e0f822/nuget/v3/index.json" />
<_RestoreAdditionalProjectSources Include="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-301ba1ee/nuget/v3/index.json" />
</ItemGroup>

<Target Name="BuildExternal">
<Exec
Command="&quot;$(DotNetPreviewTool)&quot; build monodroid.proj -c $(Configuration) -p:XamarinAndroidSourcePath=$(_Root) -p:DebuggingToolsOutputDirectory=$(MicrosoftAndroidSdkOutDir) -p:CompatTargetsOutputDirectory=$(XAInstallPrefix)xbuild/Novell -bl:$(_BinlogPathPrefix)-build-monodroid.binlog"
Expand All @@ -16,8 +22,17 @@
</Target>

<Target Name="PrepareJavaInterop">
<!-- See: https://github.com/dotnet/sdk/issues/8792#issuecomment-393756980 -->
<PropertyGroup Condition="'$(HostOS)' == 'Windows'">
<_Begin>\&quot;</_Begin>
<_End>\&quot;</_End>
</PropertyGroup>
<PropertyGroup Condition="'$(HostOS)' != 'Windows'">
<_Begin>&apos;&quot;</_Begin>
<_End>&quot;&apos;</_End>
</PropertyGroup>
<Exec
Command="&quot;$(DotNetPreviewTool)&quot; build -t:Prepare Java.Interop.sln -c $(Configuration) -p:JdksRoot=$(JavaSdkDirectory) -p:DotnetToolPath=$(DotNetPreviewTool) -bl:$(_BinlogPathPrefix)-prepare-java-interop.binlog"
Command="&quot;$(DotNetPreviewTool)&quot; build -t:Prepare Java.Interop.sln -c $(Configuration) -p:JdksRoot=$(JavaSdkDirectory) -p:DotnetToolPath=$(DotNetPreviewTool) -p:RestoreAdditionalProjectSources=$(_Begin)@(_RestoreAdditionalProjectSources)$(_End) -bl:$(_BinlogPathPrefix)-prepare-java-interop.binlog"
WorkingDirectory="$(_Root)external\Java.Interop"
/>
</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="8.0.100-rc.2.23468.1">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-rc.2.23472.8">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>e1fd7d964980ed478fa30457cf750e81105caee1</Sha>
<Sha>e13fd5c19e383f99132b1bfd2496857db089b680</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-rc.2.23466.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
<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
@@ -1,7 +1,7 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-rc.2.23468.1</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-rc.2.23472.8</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-rc.2.23466.4</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-rc.2.23466.4</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
Expand Down
4 changes: 4 additions & 0 deletions external/Java.Interop.override.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
<PropertyGroup>
<XamarinAndroidToolsDirectory>$(MSBuildThisFileDirectory)xamarin-android-tools</XamarinAndroidToolsDirectory>
<Standalone>True</Standalone>
<RestoreAdditionalProjectSources>
https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-26e0f822/nuget/v3/index.json;
https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-301ba1ee/nuget/v3/index.json;
</RestoreAdditionalProjectSources>
</PropertyGroup>

</Project>
4 changes: 4 additions & 0 deletions external/monodroid.override.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

<PropertyGroup>
<XamarinAndroidToolsDirectory>$(MSBuildThisFileDirectory)xamarin-android-tools</XamarinAndroidToolsDirectory>
<RestoreAdditionalProjectSources>
https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-26e0f822/nuget/v3/index.json;
https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-301ba1ee/nuget/v3/index.json;
</RestoreAdditionalProjectSources>
</PropertyGroup>

</Project>
8 changes: 8 additions & 0 deletions external/xamarin-android-tools.override.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project>
<PropertyGroup>
<RestoreAdditionalProjectSources>
https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-26e0f822/nuget/v3/index.json;
https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-301ba1ee/nuget/v3/index.json;
</RestoreAdditionalProjectSources>
</PropertyGroup>
</Project>
1 change: 1 addition & 0 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ public XamarinProject (string debugConfigurationName = "Debug", string releaseCo
$@"<Project>
<PropertyGroup>
<Configuration>{Configuration}</Configuration>
<DisableTransitiveFrameworkReferenceDownloads>true</DisableTransitiveFrameworkReferenceDownloads>
</PropertyGroup>
</Project>"
});
Expand Down