Skip to content

Commit a01c8fd

Browse files
rolfbjarnerolfbjarne
committed
Merge remote-tracking branch 'origin/main' into dev/rolf/msbuild-dotnet-host
2 parents 1b71d34 + d360e4b commit a01c8fd

File tree

97 files changed

+544
-3434
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+544
-3434
lines changed

‎NuGet.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<add key="darc-pub-dotnet-dotnet-455f135" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-455f1358/nuget/v3/index.json" />
1414
<!-- End: Package sources from dotnet-dotnet -->
1515
<!-- Begin: Package sources from dotnet-macios -->
16-
<add key="darc-pub-dotnet-macios-e6a0fb7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-e6a0fb79/nuget/v3/index.json" />
16+
<add key="darc-pub-dotnet-macios-6406450" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-64064500/nuget/v3/index.json" />
1717
<!-- End: Package sources from dotnet-macios -->
1818
<!-- Begin: Package sources from xamarin-xamarin-macios -->
1919
<!-- End: Package sources from xamarin-xamarin-macios -->

‎eng/Version.Details.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@ This file should be imported by eng/Versions.props
1919
<!-- dotnet/macios dependencies -->
2020
<MicrosoftiOSSdknet100_260PackageVersion>26.0.11017</MicrosoftiOSSdknet100_260PackageVersion>
2121
<MicrosoftiOSSdknet90_185PackageVersion>18.5.9227</MicrosoftiOSSdknet90_185PackageVersion>
22-
<MicrosoftiOSSdknet90_260PackageVersion>26.0.9784</MicrosoftiOSSdknet90_260PackageVersion>
22+
<MicrosoftiOSSdknet90_260PackageVersion>26.0.9785</MicrosoftiOSSdknet90_260PackageVersion>
2323
<MicrosoftMacCatalystSdknet100_260PackageVersion>26.0.11017</MicrosoftMacCatalystSdknet100_260PackageVersion>
2424
<MicrosoftMacCatalystSdknet90_185PackageVersion>18.5.9227</MicrosoftMacCatalystSdknet90_185PackageVersion>
25-
<MicrosoftMacCatalystSdknet90_260PackageVersion>26.0.9784</MicrosoftMacCatalystSdknet90_260PackageVersion>
25+
<MicrosoftMacCatalystSdknet90_260PackageVersion>26.0.9785</MicrosoftMacCatalystSdknet90_260PackageVersion>
2626
<MicrosoftmacOSSdknet100_260PackageVersion>26.0.11017</MicrosoftmacOSSdknet100_260PackageVersion>
2727
<MicrosoftmacOSSdknet90_155PackageVersion>15.5.9227</MicrosoftmacOSSdknet90_155PackageVersion>
28-
<MicrosoftmacOSSdknet90_260PackageVersion>26.0.9784</MicrosoftmacOSSdknet90_260PackageVersion>
28+
<MicrosoftmacOSSdknet90_260PackageVersion>26.0.9785</MicrosoftmacOSSdknet90_260PackageVersion>
2929
<MicrosofttvOSSdknet100_260PackageVersion>26.0.11017</MicrosofttvOSSdknet100_260PackageVersion>
3030
<MicrosofttvOSSdknet90_185PackageVersion>18.5.9227</MicrosofttvOSSdknet90_185PackageVersion>
31-
<MicrosofttvOSSdknet90_260PackageVersion>26.0.9784</MicrosofttvOSSdknet90_260PackageVersion>
31+
<MicrosofttvOSSdknet90_260PackageVersion>26.0.9785</MicrosofttvOSSdknet90_260PackageVersion>
3232
<!-- xamarin/xamarin-macios dependencies -->
3333
<MicrosoftiOSSdknet90_180PackageVersion>18.0.9617</MicrosoftiOSSdknet90_180PackageVersion>
3434
<MicrosoftMacCatalystSdknet90_180PackageVersion>18.0.9617</MicrosoftMacCatalystSdknet90_180PackageVersion>

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,21 +60,21 @@
6060
<Sha>797d30720e5e629d23eb146935da94cb1b61047e</Sha>
6161
</Dependency>
6262
<!-- This is a subscription of the .NET 9/Xcode 26.0 versions of our packages -->
63-
<Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_26.0" Version="26.0.9784">
63+
<Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_26.0" Version="26.0.9785">
6464
<Uri>https://github.com/dotnet/macios</Uri>
65-
<Sha>e6a0fb79426493766332ad077290212fb1c9db4e</Sha>
65+
<Sha>640645001f1e0d0a311ce8f4f5976c3095e0c793</Sha>
6666
</Dependency>
67-
<Dependency Name="Microsoft.macOS.Sdk.net9.0_26.0" Version="26.0.9784">
67+
<Dependency Name="Microsoft.macOS.Sdk.net9.0_26.0" Version="26.0.9785">
6868
<Uri>https://github.com/dotnet/macios</Uri>
69-
<Sha>e6a0fb79426493766332ad077290212fb1c9db4e</Sha>
69+
<Sha>640645001f1e0d0a311ce8f4f5976c3095e0c793</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.iOS.Sdk.net9.0_26.0" Version="26.0.9784">
71+
<Dependency Name="Microsoft.iOS.Sdk.net9.0_26.0" Version="26.0.9785">
7272
<Uri>https://github.com/dotnet/macios</Uri>
73-
<Sha>e6a0fb79426493766332ad077290212fb1c9db4e</Sha>
73+
<Sha>640645001f1e0d0a311ce8f4f5976c3095e0c793</Sha>
7474
</Dependency>
75-
<Dependency Name="Microsoft.tvOS.Sdk.net9.0_26.0" Version="26.0.9784">
75+
<Dependency Name="Microsoft.tvOS.Sdk.net9.0_26.0" Version="26.0.9785">
7676
<Uri>https://github.com/dotnet/macios</Uri>
77-
<Sha>e6a0fb79426493766332ad077290212fb1c9db4e</Sha>
77+
<Sha>640645001f1e0d0a311ce8f4f5976c3095e0c793</Sha>
7878
</Dependency>
7979
<!-- This is a subscription of the .NET 10/Xcode 26.0 versions of our packages -->
8080
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_26.0" Version="26.0.11017">

‎msbuild/Xamarin.MacDev.Tasks/Tasks/AOTCompile.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ public override bool Execute ()
338338
environment [item.ItemSpec] = item.GetMetadata ("Value");
339339

340340
ForEach (listOfArguments, (arg) => {
341-
ExecuteAsync (AOTCompilerPath, arg.Arguments, environment: environment, sdkDevPath: GetSdkDevPath (), showErrorIfFailure: false /* we show our own error below */)
341+
ExecuteAsync (AOTCompilerPath, arg.Arguments, environment: environment, showErrorIfFailure: false /* we show our own error below */)
342342
.ContinueWith ((v) => {
343343
if (v.Result.ExitCode != 0)
344344
Log.LogError (MSBStrings.E7118 /* Failed to AOT compile {0}, the AOT compiler exited with code {1} */, Path.GetFileName (arg.Input), v.Result.ExitCode);

‎msbuild/Xamarin.MacDev.Tasks/Tasks/AlTool.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public override bool Execute ()
4141
return false;
4242

4343
cancellationTokenSource = new CancellationTokenSource ();
44-
var rv = ExecuteAsync (Log, executable, args, sdkDevPath: GetSdkDevPath (), cancellationToken: cancellationTokenSource.Token).Result;
44+
var rv = ExecuteAsync (executable, args, cancellationToken: cancellationTokenSource.Token).Result;
4545
LogErrorsFromOutput (rv.Output.MergedOutput);
4646
return !Log.HasLoggedErrors;
4747
}

‎msbuild/Xamarin.MacDev.Tasks/Tasks/BGen.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ public override bool Execute ()
286286
return false;
287287

288288
cancellationTokenSource = new CancellationTokenSource ();
289-
ExecuteAsync (Log, executable, args, environment: env, cancellationToken: cancellationTokenSource.Token).Wait ();
289+
ExecuteAsync (executable, args, environment: env, cancellationToken: cancellationTokenSource.Token).Wait ();
290290
return !Log.HasLoggedErrors;
291291
}
292292

‎msbuild/Xamarin.MacDev.Tasks/Tasks/Codesign.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ void Sign (SignInfo info)
362362
var environment = new Dictionary<string, string?> () {
363363
{ "CODESIGN_ALLOCATE", GetCodesignAllocate (item) },
364364
};
365-
var rv = ExecuteAsync (fileName, arguments, null, environment).Result;
365+
var rv = ExecuteAsync (fileName, arguments, environment).Result;
366366
var exitCode = rv.ExitCode;
367367
var messages = rv.Output.StandardOutput;
368368

‎msbuild/Xamarin.MacDev.Tasks/Tasks/CompileNativeCode.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public override bool Execute ()
139139
arguments.Add ("-c");
140140
arguments.Add (src);
141141

142-
processes [i] = ExecuteAsync ("xcrun", arguments, sdkDevPath: GetSdkDevPath ());
142+
processes [i] = ExecuteAsync ("xcrun", arguments);
143143
}
144144

145145
System.Threading.Tasks.Task.WaitAll (processes);

‎msbuild/Xamarin.MacDev.Tasks/Tasks/CompileSceneKitAssets.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@ Task CopySceneKitAssets (string scnassets, string output, string intermediate)
8383
args.Add ($"--resources-folder-path={AppBundleName}");
8484

8585
var executable = GetExecutable (args, ToolName, CopySceneKitAssetsPath);
86-
87-
return ExecuteAsync (executable, args, sdkDevPath: GetSdkDevPath (), environment: environment, showErrorIfFailure: true);
86+
return ExecuteAsync (executable, args, environment: environment, showErrorIfFailure: true);
8887
}
8988

9089
static bool TryGetScnAssetsPath (string file, out string scnassets)

‎msbuild/Xamarin.MacDev.Tasks/Tasks/CoreMLCompiler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ int Compile (ITaskItem item, string outputDir, string log, string partialPlist)
5555
args.Add (partialPlist);
5656

5757
var executable = GetExecutable (args, ToolName, CoreMlcPath);
58-
var rv = ExecuteAsync (executable, args, GetSdkDevPath ()).Result;
58+
var rv = ExecuteAsync (executable, args).Result;
5959
var exitCode = rv.ExitCode;
6060
var output = rv.Output.StandardOutput;
6161
File.WriteAllText (log, output);

0 commit comments

Comments
 (0)