diff --git a/.external b/.external index b0955939ad3..4f4d7fcacde 100644 --- a/.external +++ b/.external @@ -1,2 +1,2 @@ -xamarin/monodroid:main@c36049815ca04379194dd32f402f56beb5b992d3 +xamarin/monodroid:main@6c16fb50a77cf7d5a040c67b0e970e090ba4ce6e mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d diff --git a/NuGet.config b/NuGet.config index 1ed561d2bd3..1eda387eb45 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,9 +11,11 @@ - - - + + + + + diff --git a/build-tools/scripts/DotNet.targets b/build-tools/scripts/DotNet.targets index 2c477fe1b55..83b37c93f91 100644 --- a/build-tools/scripts/DotNet.targets +++ b/build-tools/scripts/DotNet.targets @@ -8,6 +8,12 @@ maui-android + + + <_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" /> + + + + + <_Begin>\" + <_End>\" + + + <_Begin>'" + <_End>"' + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb02dc87077..535b764106f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,8 +1,8 @@ - + https://github.com/dotnet/installer - e1fd7d964980ed478fa30457cf750e81105caee1 + e13fd5c19e383f99132b1bfd2496857db089b680 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 5099b035dd7..ef40496657e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 8.0.100-rc.2.23468.1 + 8.0.100-rc.2.23472.8 8.0.0-rc.2.23466.4 8.0.0-rc.2.23466.4 7.0.0-beta.22103.1 diff --git a/external/Java.Interop.override.props b/external/Java.Interop.override.props index 5242a70af3f..e3acd4b73ed 100644 --- a/external/Java.Interop.override.props +++ b/external/Java.Interop.override.props @@ -3,6 +3,10 @@ $(MSBuildThisFileDirectory)xamarin-android-tools True + + 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; + diff --git a/external/monodroid.override.props b/external/monodroid.override.props index 8cbac6945cf..9a7936119a0 100644 --- a/external/monodroid.override.props +++ b/external/monodroid.override.props @@ -2,6 +2,10 @@ $(MSBuildThisFileDirectory)xamarin-android-tools + + 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; + diff --git a/external/xamarin-android-tools.override.props b/external/xamarin-android-tools.override.props new file mode 100644 index 00000000000..837625dd3eb --- /dev/null +++ b/external/xamarin-android-tools.override.props @@ -0,0 +1,8 @@ + + + + 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; + + + diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs index 7ce6c520bfe..a3fe0d7a4c0 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs @@ -95,6 +95,7 @@ public XamarinProject (string debugConfigurationName = "Debug", string releaseCo $@" {Configuration} + true " });