Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
<add key="darc-pub-dotnet-android-a618557" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-a618557d/nuget/v3/index.json" />
<add key="darc-pub-dotnet-android-a618557-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-android-a618557d-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-android -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-pub-dotnet-runtime-3b1cfdc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-3b1cfdc3/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<!-- ensure only the sources defined below are used -->
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" protocolVersion="3" />
Expand Down
29 changes: 17 additions & 12 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-rc.1.25419.117">
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.100-rc.1.25451.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>21f8aefd0be94f9dda15acb4b1c2247aa7a47d3a</Sha>
<Sha>2db1f5ee2bdda2e8d873769325fabede32e420e0</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-rc.1.25419.117">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.0-rc.1.25451.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>21f8aefd0be94f9dda15acb4b1c2247aa7a47d3a</Sha>
<Sha>2db1f5ee2bdda2e8d873769325fabede32e420e0</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25419.117">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25451.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>21f8aefd0be94f9dda15acb4b1c2247aa7a47d3a</Sha>
<Sha>2db1f5ee2bdda2e8d873769325fabede32e420e0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25419.117">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25451.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>21f8aefd0be94f9dda15acb4b1c2247aa7a47d3a</Sha>
<Sha>2db1f5ee2bdda2e8d873769325fabede32e420e0</Sha>
</Dependency>
<!-- Previous .NET version -->
<Dependency Name="Microsoft.NET.Workload.Mono.ToolChain.Current.Manifest-9.0.100" Version="9.0.9">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>3b1cfdc32ac10833176a22d2d5b9ae03595472bf</Sha>
</Dependency>
<!-- Previous .NET Android version(s) -->
<Dependency Name="Microsoft.NET.Sdk.Android.Manifest-9.0.100" Version="35.0.101">
Expand All @@ -27,13 +32,13 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25419.117">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25451.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>21f8aefd0be94f9dda15acb4b1c2247aa7a47d3a</Sha>
<Sha>2db1f5ee2bdda2e8d873769325fabede32e420e0</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.100-rc.1.25419.117">
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.100-rc.1.25451.107">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>21f8aefd0be94f9dda15acb4b1c2247aa7a47d3a</Sha>
<Sha>2db1f5ee2bdda2e8d873769325fabede32e420e0</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
12 changes: 6 additions & 6 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftNETSdkPackageVersion>10.0.100-rc.1.25419.117</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.100-rc.1.25451.107</MicrosoftNETSdkPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-rc.1.25419.117</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25419.117</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.0-rc.1.25451.107</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25451.107</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25419.117</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25451.107</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadMonoToolChainPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETWorkloadMonoToolChainPackageVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.100-rc.1.25419.117</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25419.117</MicrosoftDotNetCecilPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.100-rc.1.25451.107</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25451.107</MicrosoftDotNetCecilPackageVersion>
<SystemIOHashingPackageVersion>9.0.4</SystemIOHashingPackageVersion>
<!-- Previous .NET Android version -->
<MicrosoftNETSdkAndroidManifest90100PackageVersion>35.0.101</MicrosoftNETSdkAndroidManifest90100PackageVersion>
Expand Down
3 changes: 1 addition & 2 deletions external/Java.Interop.override.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
<XamarinAndroidToolsDirectory>$(MSBuildThisFileDirectory)xamarin-android-tools</XamarinAndroidToolsDirectory>
<Standalone>True</Standalone>
<RestoreAdditionalProjectSources>
https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ef07c4f2/nuget/v3/index.json;
https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-061c8b71/nuget/v3/index.json;
https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-3b1cfdc3/nuget/v3/index.json;
</RestoreAdditionalProjectSources>
</PropertyGroup>

Expand Down
3 changes: 1 addition & 2 deletions external/debugger-libs.override.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
<!-- Disables the transitive restore of packages like Microsoft.AspNetCore.App.Ref, Microsoft.WindowsDesktop.App.Ref -->
<DisableTransitiveFrameworkReferenceDownloads>true</DisableTransitiveFrameworkReferenceDownloads>
<RestoreAdditionalProjectSources>
https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ef07c4f2/nuget/v3/index.json;
https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-061c8b71/nuget/v3/index.json;
https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-3b1cfdc3/nuget/v3/index.json;
</RestoreAdditionalProjectSources>
</PropertyGroup>
</Project>
3 changes: 1 addition & 2 deletions external/xamarin-android-tools.override.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
<AndroidToolsDisableMultiTargeting>true</AndroidToolsDisableMultiTargeting>
<PackageOutputPath>$(MSBuildThisFileDirectory)..\bin\Build$(Configuration)\nuget-unsigned\</PackageOutputPath>
<RestoreAdditionalProjectSources>
https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ef07c4f2/nuget/v3/index.json;
https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-061c8b71/nuget/v3/index.json;
https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-3b1cfdc3/nuget/v3/index.json;
</RestoreAdditionalProjectSources>
</PropertyGroup>
<Target Name="_GetXAVersionInfo"
Expand Down
4 changes: 4 additions & 0 deletions tools/workload-dependencies/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,8 @@
This is so that we can cleanly import Xamarin.Installer.Common.props and
Xamarin.Android.Common.props from WorkloadDependencies.proj.
-->
<PropertyGroup>
<!-- Disables the transitive restore of packages like Microsoft.AspNetCore.App.Ref, Microsoft.WindowsDesktop.App.Ref -->
<DisableTransitiveFrameworkReferenceDownloads>true</DisableTransitiveFrameworkReferenceDownloads>
</PropertyGroup>
</Project>
Loading