Skip to content
Open
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
7 changes: 0 additions & 7 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-dotnet -->
<add key="darc-pub-dotnet-dotnet-6960037" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-69600372/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-pub-dotnet-runtime-c2c9c8b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-c2c9c8ba/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-android -->
<!-- End: Package sources from dotnet-android -->
Expand All @@ -19,11 +17,6 @@
<add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
<!-- This is for packages needed by debugger-libs -->
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 9.0.5 -->
<add key="darc-pub-dotnet-emsdk-3cddc1f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3cddc1fe/nuget/v3/index.json" />
<add key="darc-pub-dotnet-runtime-207cda3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-207cda34/nuget/v3/index.json" />
<!-- Added manually for dotnet/runtime 8.0.16 -->
<add key="darc-pub-dotnet-runtime-6cd8ef8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-6cd8ef87/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources />
</configuration>
4 changes: 3 additions & 1 deletion build-tools/automation/azure-pipelines.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ resources:
- repository: maui
type: github
name: dotnet/maui
ref: refs/heads/net10.0
ref: refs/heads/main
endpoint: xamarin

parameters:
Expand Down Expand Up @@ -120,6 +120,8 @@ extends:
clean: all
variables:
BuildVersion: $(Build.BuildId)
# Ignore MAUI's public API analyzer errors (RS0016) - dotnet/android does not care about those
PublicApiType: Generate
steps:
- checkout: maui
clean: true
Expand Down
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.300-preview.26156.117">
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.300-preview.0.26165.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1e7efacf690950614a46f9e40bb3efa61231f9f8</Sha>
<Sha>695853e77c90c85e2ad501d2ed148d7819eef80e</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="10.0.3-servicing.26065.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
Expand Down Expand Up @@ -40,13 +40,13 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.26156.117">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.26165.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1e7efacf690950614a46f9e40bb3efa61231f9f8</Sha>
<Sha>695853e77c90c85e2ad501d2ed148d7819eef80e</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.300-preview.26156.117">
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.300-preview.26165.106">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>1e7efacf690950614a46f9e40bb3efa61231f9f8</Sha>
<Sha>695853e77c90c85e2ad501d2ed148d7819eef80e</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<Project>
<!--Package versions-->
<PropertyGroup>
<MicrosoftNETSdkPackageVersion>10.0.300-preview.26156.117</MicrosoftNETSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.300-preview.0.26165.106</MicrosoftNETSdkPackageVersion>
<MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
<MicrosoftNETILLinkPackageVersion>10.0.3-servicing.26065.102</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.3</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.26156.117</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.26165.106</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftNETWorkloadMonoToolchainCurrentManifest100100PackageVersion>10.0.104</MicrosoftNETWorkloadMonoToolchainCurrentManifest100100PackageVersion>
<MicrosoftNETWorkloadEmscriptenCurrentManifest100100PackageVersion>10.0.104</MicrosoftNETWorkloadEmscriptenCurrentManifest100100PackageVersion>
<MicrosoftNETWorkloadMonoToolChainPackageVersion>$(MicrosoftNETWorkloadMonoToolChainCurrentManifest100100PackageVersion)</MicrosoftNETWorkloadMonoToolChainPackageVersion>
<MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest100100PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.300-preview.26156.117</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.300-preview.26165.106</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.26065.102</MicrosoftDotNetCecilPackageVersion>
<SystemIOHashingPackageVersion>9.0.4</SystemIOHashingPackageVersion>
<!-- Previous .NET Android version -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ protected Process ExecuteProcess (string [] args, string workingDirectory = null
p.StartInfo.WorkingDirectory = workingDirectory;
}
p.StartInfo.SetEnvironmentVariable ("DOTNET_MULTILEVEL_LOOKUP", "0");
// Workaround for dotnet/msbuild#13175: the MSBuild app host needs DOTNET_HOST_PATH
// to bootstrap the .NET runtime when spawning TaskHostFactory task hosts (e.g. ILLink).
// Without this, builds fail with MSB4221 when using a locally-installed SDK.
p.StartInfo.SetEnvironmentVariable ("DOTNET_HOST_PATH", p.StartInfo.FileName);
p.StartInfo.SetEnvironmentVariable ("PATH", TestEnvironment.DotNetPreviewDirectory + Path.PathSeparator + Environment.GetEnvironmentVariable ("PATH"));
if (TestEnvironment.UseLocalBuildOutput) {
p.StartInfo.SetEnvironmentVariable ("DOTNETSDK_WORKLOAD_MANIFEST_ROOTS", TestEnvironment.WorkloadManifestOverridePath);
Expand Down