Skip to content

Commit 741e82a

Browse files
rmarinhoCopilotGitHub Actions Autoformatter
authored
Onboard to dotnet/arcade build system (#166)
* Onboard to dotnet/arcade build system Add Arcade SDK infrastructure for official builds with signing, publishing, and dependency flow via darc/maestro. Changes: - Add global.json with Arcade SDK 11.0.0-beta.26173.2 - Add NuGet.config with dnceng feeds - Update Directory.Build.props/targets with Arcade SDK imports - Add eng/Versions.props for centralized version management - Add eng/Version.Details.xml for dependency tracking - Add eng/Publishing.props, Signing.props, SignCheckExclusionsFile.txt - Add eng/common/ shared build scripts from dotnet/arcade - Add eng/pipelines/official.yml (1ES official build pipeline) - Add .config/1espt/PipelineAutobaseliningConfig.yml for SDL - Update azure-pipelines.yaml to use Arcade templates for public CI - Centralize NuGet package versions in eng/Versions.props - Remove MicroBuild.Core, SourceLink, GitInfo (Arcade handles these) - Fix solution Release configuration mapping for Xamarin.MacDev - Add eng/setup-darc.sh for dependency flow configuration Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Remove orphaned GitInfo.txt Versioning is now handled by Arcade SDK (eng/Versions.props). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Move to net10.0 * Auto-format source code * Move to Arcade SDK 10 (.NET 10.0.1xx SDK channel) Update from Arcade SDK 11 to 10.0.0-beta.26174.121 via darc update-dependencies --channel '.NET 10.0.1xx SDK'. - global.json: .NET SDK 10.0.104, Arcade SDK 10.0.0-beta.26174.121 - eng/Version.Details.xml: URI now points to dotnet/dotnet (VMR) - eng/common/: updated to matching Arcade SDK 10 scripts - eng/Versions.props: removed Arcade SDK 11-specific versions Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Fix LICENSE to match Arcade SDK expected MIT format Remove 'Xamarin SDK' header — Arcade's RepositoryValidation.proj compares LICENSE against its MIT template line-by-line. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Auto-format source code * Fix AssemblyCopyright to Microsoft for Arcade signing validation Arcade's Sign.proj (SIGN004) checks AssemblyCopyright to determine if a DLL is first-party or third-party. 'Xamarin Inc.' was being flagged as 3rd-party, blocking signing with the Microsoft certificate. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Auto-format source code * Fix macOS build to use --ci flag for proper log/artifact output The macOS job was missing --ci, which enables binary logging and creates artifacts/log/. Without it the Publish Logs step fails because the directory doesn't exist. cibuild.sh passes --ci automatically; build.sh needs it explicitly. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Remove nuget.org * Auto-format source code * Set _SignType to test for initial onboarding Real signing requires ESRP service connection approval. Use test signing until the pipeline is fully authorized. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * Auto-format source code --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: GitHub Actions Autoformatter <autoformat@example.com>
1 parent 418db66 commit 741e82a

183 files changed

Lines changed: 13640 additions & 193 deletions

File tree

Some content is hidden

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

‎.config/1espt/PipelineAutobaseliningConfig.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# 1ES Pipeline Template auto-baselining configuration.
2+
# Pipeline IDs will be populated automatically once pipelines are registered in Azure DevOps.
3+
#
4+
# See 1ES Pipeline Templates SDL analysis documentation for details.
5+
pipelines: {}

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ obj
55
/packages/
66
.vs/
77
*.nupkg
8+
artifacts/
9+
.packages/

‎Directory.Build.props‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,21 @@
11
<Project>
2-
<PropertyGroup>
3-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4-
<RepositoryUrl>https://github.com/dotnet/macios-devtools</RepositoryUrl>
5-
<RepositoryType>git</RepositoryType>
6-
</PropertyGroup>
72

8-
<PropertyGroup>
9-
<BaseOutputPath>$(MSBuildThisFileDirectory)bin\</BaseOutputPath>
10-
<ToolOutputFullPath>$(BaseOutputPath)$(Configuration)\</ToolOutputFullPath>
11-
<TestOutputFullPath>$(BaseOutputPath)Test$(Configuration)\</TestOutputFullPath>
12-
</PropertyGroup>
3+
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
4+
5+
<PropertyGroup>
6+
<Copyright>$(CopyrightNetFoundation)</Copyright>
7+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
8+
<PackageProjectUrl>https://github.com/dotnet/macios-devtools</PackageProjectUrl>
9+
<RepositoryUrl>https://github.com/dotnet/macios-devtools</RepositoryUrl>
10+
<RepositoryType>git</RepositoryType>
11+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
12+
<DebugType>embedded</DebugType>
13+
<DebugSymbols>true</DebugSymbols>
14+
<LangVersion>latest</LangVersion>
15+
<!-- Set to true for packages that ship publicly on NuGet.org -->
16+
<IsShipping>true</IsShipping>
17+
<!-- Suppress NU1507: official builds inject internal feeds not covered by packageSourceMapping -->
18+
<NoWarn>$(NoWarn);NU1507</NoWarn>
19+
</PropertyGroup>
20+
1321
</Project>

‎Directory.Build.targets‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
1-
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2-
<ItemGroup>
3-
<PackageReference Include="GitInfo" Version="2.1.2" PrivateAssets="all" />
4-
</ItemGroup>
5-
<PropertyGroup>
6-
<GitThisAssembly>false</GitThisAssembly>
7-
<GitDefaultBranch>main</GitDefaultBranch>
8-
</PropertyGroup>
1+
<Project>
92

10-
<Target Name="SetVersion" BeforeTargets="GetAssemblyVersion;GetPackageVersion;GenerateNuspec" DependsOnTargets="GitVersion">
11-
<PropertyGroup>
12-
<Version>$(GitSemVerMajor).$(GitSemVerMinor).$(GitSemVerPatch)</Version>
13-
<PackageVersion>$(Version)$(PackageVersionSuffix)</PackageVersion>
14-
<InformationalVersion>$(Version); git-rev-head:$(GitCommit); git-branch:$(GitBranch)</InformationalVersion>
15-
</PropertyGroup>
3+
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
4+
5+
<!-- Workaround for dotnet/arcade#16611: WiX 5 tools path missing platform subdirectories.
6+
Remove once the upstream fix is available. -->
7+
<Target Name="CreateWixToolsPathWorkaround"
8+
BeforeTargets="Build"
9+
Condition="Exists('$(RepoRoot).packages\microsoft.wixtoolset.sdk\$(MicrosoftWixToolsetSdkVersion)')">
10+
<MakeDir Directories="$(RepoRoot).packages\microsoft.wixtoolset.sdk\$(MicrosoftWixToolsetSdkVersion)\tools\net472\x64"
11+
Condition="!Exists('$(RepoRoot).packages\microsoft.wixtoolset.sdk\$(MicrosoftWixToolsetSdkVersion)\tools\net472\x64')" />
12+
<MakeDir Directories="$(RepoRoot).packages\microsoft.wixtoolset.sdk\$(MicrosoftWixToolsetSdkVersion)\tools\net472\arm64"
13+
Condition="!Exists('$(RepoRoot).packages\microsoft.wixtoolset.sdk\$(MicrosoftWixToolsetSdkVersion)\tools\net472\arm64')" />
1614
</Target>
1715

1816
<Import
1917
Project="$([System.IO.Path]::GetDirectoryName($(MSBuildThisFileDirectory))).override.targets"
2018
Condition=" Exists('$([System.IO.Path]::GetDirectoryName($(MSBuildThisFileDirectory))).override.targets') "
2119
/>
20+
2221
</Project>

‎GitInfo.txt‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎LICENSE‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
Xamarin SDK
2-
31
The MIT License (MIT)
42

53
Copyright (c) .NET Foundation Contributors

‎NuGet.config‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<solution>
4+
<add key="disableSourceControlIntegration" value="true" />
5+
</solution>
6+
<packageSources>
7+
<clear />
8+
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
9+
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
10+
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
11+
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
12+
</packageSources>
13+
<disabledPackageSources>
14+
<clear />
15+
</disabledPackageSources>
16+
</configuration>

‎Xamarin.MacDev.sln‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Global
1313
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1414
{CC3D9353-20C4-467A-8522-A9DED6F0C753}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1515
{CC3D9353-20C4-467A-8522-A9DED6F0C753}.Debug|Any CPU.Build.0 = Debug|Any CPU
16-
{CC3D9353-20C4-467A-8522-A9DED6F0C753}.Release|Any CPU.ActiveCfg = Debug|Any CPU
17-
{CC3D9353-20C4-467A-8522-A9DED6F0C753}.Release|Any CPU.Build.0 = Debug|Any CPU
16+
{CC3D9353-20C4-467A-8522-A9DED6F0C753}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{CC3D9353-20C4-467A-8522-A9DED6F0C753}.Release|Any CPU.Build.0 = Release|Any CPU
1818
{39DBAAF8-57A5-49A3-9E9A-11B545906AED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1919
{39DBAAF8-57A5-49A3-9E9A-11B545906AED}.Debug|Any CPU.Build.0 = Debug|Any CPU
2020
{39DBAAF8-57A5-49A3-9E9A-11B545906AED}.Release|Any CPU.ActiveCfg = Release|Any CPU

‎Xamarin.MacDev/MobileProvisionIndex.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -754,5 +754,5 @@ public static IList<MobileProvision> GetMobileProvisions (MobileProvisionPlatfor
754754
}
755755
}
756756

757-
#endregion MobileProvisionIndex
757+
#endregion MobileProvisionIndex
758758
}

‎Xamarin.MacDev/Properties/AssemblyInfo.cs‎

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,14 @@
1-
//
2-
// AssemblyInfo.cs
3-
//
4-
// Author: Jeffrey Stedfast <jeff@xamarin.com>
5-
//
6-
// Copyright (c) 2013 Xamarin Inc.
7-
//
8-
// Permission is hereby granted, free of charge, to any person obtaining a copy
9-
// of this software and associated documentation files (the "Software"), to deal
10-
// in the Software without restriction, including without limitation the rights
11-
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12-
// copies of the Software, and to permit persons to whom the Software is
13-
// furnished to do so, subject to the following conditions:
14-
//
15-
// The above copyright notice and this permission notice shall be included in
16-
// all copies or substantial portions of the Software.
17-
//
18-
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19-
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
20-
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
21-
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
22-
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
23-
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
24-
// THE SOFTWARE.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
253

264
using System.Reflection;
275
using System.Runtime.CompilerServices;
286

29-
// Information about this assembly is defined by the following attributes.
30-
// Change them to the values specific to your project.
317
[assembly: AssemblyTitle ("Xamarin.Apple.Tools.MaciOS")]
328
[assembly: AssemblyDescription ("")]
339
[assembly: AssemblyConfiguration ("")]
34-
[assembly: AssemblyCompany ("Xamarin Inc.")]
35-
[assembly: AssemblyProduct ("")]
36-
[assembly: AssemblyCopyright ("Xamarin Inc.")]
37-
[assembly: AssemblyTrademark ("Xamarin Inc.")]
10+
[assembly: AssemblyCompany ("Microsoft Corporation")]
11+
[assembly: AssemblyProduct ("Xamarin.Apple.Tools.MaciOS")]
12+
[assembly: AssemblyCopyright ("© Microsoft Corporation. All rights reserved.")]
13+
[assembly: AssemblyTrademark ("")]
3814
[assembly: AssemblyCulture ("")]
39-
// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
40-
// The form "{Major}.{Minor}.*" will automatically update the build and revision,
41-
// and "{Major}.{Minor}.{Build}.*" will update just the revision.
42-
[assembly: AssemblyVersion ("1.0.0.0")]
43-
// The following attributes are used to specify the signing key for the assembly,
44-
// if desired. See the Mono documentation for more information about signing.
45-
//[assembly: AssemblyDelaySign(false)]
46-
//[assembly: AssemblyKeyFile("")]

0 commit comments

Comments
 (0)