Skip to content

[release/8.0.1xx-rc1] Update dependencies from dotnet/installer #8279

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 11 commits into from
Aug 23, 2023
Merged

[release/8.0.1xx-rc1] Update dependencies from dotnet/installer #8279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6b763ab
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Aug 18, 2023
9ea76c7
Feeds for dotnet/runtime 7.0.11
jonathanpeppers Aug 18, 2023
77e4802
Feeds for dotnet/runtime 6.0.22
jonathanpeppers Aug 18, 2023
440bacd
Update dependencies from https://github.com/dotnet/installer build 20…
dotnet-maestro[bot] Aug 22, 2023
1bbefa3
Bump to xamarin/java.interop/release/8.0.1xx-rc1@81c228d1
jonathanpeppers Aug 22, 2023
f56fb01
Bump to xamarin/xamarin-android-tools/release/8.0.1xx-rc1@2b8ac126
jonathanpeppers Aug 22, 2023
3043d43
Bump to xamarin/java.interop/release/8.0.1xx-rc1@426bd040
jonathanpeppers Aug 22, 2023
c9bfaa2
Bump to xamarin/java.interop/release/8.0.1xx-rc1@1c715a50
jonathanpeppers Aug 22, 2023
2a06480
Bump to xamarin/monodroid/release/8.0.1xx-rc1@release/8.0.1xx-rc1@6e5…
jonathanpeppers Aug 22, 2023
1cfffa9
DisableTransitiveFrameworkReferenceDownloads in tests
jonathanpeppers Aug 22, 2023
6ff0eb0
Merge branch 'release/8.0.1xx-rc1' into darc-release/8.0.1xx-rc1-13dd…
jonathanpeppers Aug 22, 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@057b17fe491f51823eb814f0163bb92686e24991
xamarin/monodroid:release/8.0.1xx-rc1@6e57bd3ec72330e20d59380717b09e56322d2ef8
mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d
9 changes: 6 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,12 @@
<!-- 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 6.0.11 -->
<add key="darc-pub-dotnet-emsdk-c3fc739" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c3fc739c/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-1e1f688" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-1e1f688d/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-a2ad4f0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-a2ad4f03/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 6.0.22 -->
<add key="darc-pub-dotnet-emsdk-f9eee07" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-f9eee071/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-762f437" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-762f4379/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources />
</configuration>
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.1.23417.5">
<Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-rc.1.23422.1">
<Uri>https://github.com/dotnet/installer</Uri>
<Sha>684771d03c2bb6deb58e20448c9be29191d2d445</Sha>
<Sha>85170c1c70401fabee8d4ed9345ff71df450eb8f</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-rc.1.23414.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.1.23417.5</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>8.0.100-rc.1.23422.1</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>8.0.0-rc.1.23414.4</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>8.0.0-rc.1.23419.3</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
Expand Down
2 changes: 1 addition & 1 deletion external/Java.Interop
Open in desktop
Submodule Java.Interop updated from 5adb4d to 1c715a
2 changes: 1 addition & 1 deletion external/xamarin-android-tools
Open in desktop
Submodule xamarin-android-tools updated from 52f086 to 2b8ac1
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