Skip to content

Commit

Permalink
[ci] Opt in to symbol archiving during VS insertion (#12547) (#12575)
Browse files Browse the repository at this point in the history
Context: xamarin/yaml-templates#131

Enables conversion and archiving of symbol files during the VS insertion
stage.  Symbol archiving steps will only run if both the
`symbolArtifactName` parameter is provided, and `archiveSymbols` is set
to true.  The `symbolConversionFilters` parameter can be used to filter
out paths of symbol files that should not be converted/archived.

Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>

Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
Co-authored-by: Alex Soto <alex@alexsoto.me>
  • Loading branch information
3 people committed Aug 29, 2021
1 parent 2d10498 commit 802c412
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 1 deletion.
1 change: 1 addition & 0 deletions msbuild/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,7 @@ MSBUILD_PRODUCTS += $(DOTNET_TARGETS)
DOTNET_IOS_WINDOWS_OUTPUT_FILES = \
$(foreach dll,$(IOS_WINDOWS_TASK_ASSEMBLIES),$(dll).*) \
$(foreach dll,$(IOS_WINDOWS_DEPENDENCIES),$(dll).*) \
System.Diagnostics.Tracer.pdb \
Broker.zip \
Build.zip \
Xamarin.PreBuilt.iOS.app.zip
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<PackageReference Include="Xamarin.Messaging.Core" Version="$(MessagingVersion)" IncludeAssets="build" />
<PackageReference Include="Xamarin.Messaging.Server" Version="$(MessagingVersion)" IncludeAssets="contentFiles" />
<PackageReference Include="Xamarin.iOS.HotRestart.Client" Version="$(HotRestartVersion)" />
<PackageReference Include="System.Diagnostics.Tracer" Version="2.0.8" GeneratePathProperty="true" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Messaging\Xamarin.Messaging.Build\Xamarin.Messaging.Build.csproj">
Expand All @@ -33,6 +34,7 @@
<Link>Xamarin.PreBuilt.iOS.app.zip</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(PkgSystem_Diagnostics_Tracer)\lib\netstandard1.3\System.Diagnostics.Tracer.pdb" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
<ItemGroup>
<Folder Include="Tasks\" />
Expand Down
1 change: 1 addition & 0 deletions src/Makefile.generator
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ $(DOTNET_DESTDIR)/%.Sdk/tools/bin/bgen: bgen/bgen.dotnet | $(DOTNET_DESTDIR)/%.S

$(DOTNET_DESTDIR)/%.Sdk/tools/lib/Xamarin.Apple.BindingAttributes.dll: $(DOTNET_BUILD_DIR)/Xamarin.Apple.BindingAttributes.dll | $(DOTNET_DESTDIR)/%.Sdk/tools/lib
$(Q) $(CP) $< $@
$(Q) $(CP) $(<:.dll=.pdb) $(@:.dll=.pdb)

DOTNET_TARGETS += \
$(DOTNET_BUILD_DIR)/bgen/bgen \
Expand Down
3 changes: 2 additions & 1 deletion src/bgen/bgen.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Mono.Options" Version="6.6.0.161" />
<PackageReference Include="Mono.Options" Version="6.12.0.148" GeneratePathProperty="true" />
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="4.7.2" />
<!--<PackageReference Include="XliffTasks" Version="1.0.0-beta.19607.1" PrivateAssets="all" />-->
</ItemGroup>
Expand Down Expand Up @@ -68,6 +68,7 @@
<Compile Include="..\..\tools\common\SdkVersions.cs">
<Link>SdkVersions.cs</Link>
</Compile>
<None Include="$(PkgMono_Options)\lib\netstandard2.0\Mono.Options.pdb" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="..\Resources.resx">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,11 @@ stages:
- template: vs-insertion/stage/v1.yml@templates
parameters:
dependsOn: prepare_release
symbolArtifactName: nuget-signed
symbolArtifactPatterns: |
Microsoft.NET.Sdk.iOS.Manifest*.nupkg
Microsoft.NET.Sdk.MacCatalyst.Manifest*.nupkg
Microsoft.iOS*.nupkg
Microsoft.MacCatalyst*.nupkg
symbolConversionFilters: '*mlaunch.app*'
condition: eq(variables.IsPRBuild, 'False')

5 comments on commit 802c412

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ [CI Build] Tests passed on Build. ✅

Tests passed on Build.

API diff

✅ API Diff from stable

View API diff

API & Generator diff

API Diff (from PR only) (no change)
ℹ️ Generator Diff (please review changes)

Packages generated

View packages

🎉 All 250 tests passed 🎉

Pipeline on Agent XAMBOT-1038.BigSur'
[ci] Opt in to symbol archiving during VS insertion (#12547) (#12575)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Tests were not ran (VSTS: device tests tvOS). ⚠️

Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.

Pipeline on Agent
[ci] Opt in to symbol archiving during VS insertion (#12547) (#12575)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Tests were not ran (VSTS: device tests iOS). ⚠️

Results were skipped for this run due to provisioning problems Azure Devops. Please contact the bot administrator.

Pipeline on Agent
[ci] Opt in to symbol archiving during VS insertion (#12547) (#12575)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❌ Tests failed on macOS M1 - Mac Big Sur (11.5) ❌

Tests failed on M1 - Mac Big Sur (11.5).

Failed tests are:

  • xammac_tests

Pipeline on Agent
[ci] Opt in to symbol archiving during VS insertion (#12547) (#12575)

@vs-mobiletools-engineering-service2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ Tests passed on macOS Mac Mojave (10.14) ✅

Tests passed

All tests on macOS X Mac Mojave (10.14) passed.

Pipeline on Agent
[ci] Opt in to symbol archiving during VS insertion (#12547) (#12575)

Please sign in to comment.