Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI Build changes #1362

Merged
merged 40 commits into from
Jan 22, 2024
Merged

CI Build changes #1362

merged 40 commits into from
Jan 22, 2024

Conversation

dotMorten
Copy link
Member

@dotMorten dotMorten commented Jan 5, 2024

Description

Adds the project and script changes to allow for daily CI builds

Type of change

  • Build changes

Platforms tested on

  • WPF .NET 8
  • WPF Framework
  • WinUI
  • MAUI WinUI
  • MAUI Android
  • MAUI iOS
  • MAUI MacCatalyst

Checklist

  • Self-review of changes
  • All changes work as expected on all affected platforms
  • There are no warnings related to changes
  • Code is commented and follows .NET conventions and standards
  • Codemaid and XAML styler extensions have been run on every changed file
  • No unrelated changes have been made to any other code or project files
  • Screenshots are correct size and display in description tab (800 x 600 on Windows, MAUI mobile platforms use the MAUI Windows screenshot)

duffh and others added 26 commits November 9, 2023 20:47
Co-authored-by: William Bohrmann <[email protected]>
Co-authored-by: Andy Weis <[email protected]>
Co-authored-by: Zack Allen <[email protected]>
Co-authored-by: Morten Nielsen <[email protected]>
Co-authored-by: William Bohrmann <[email protected]>
Co-authored-by: Preeti <[email protected]>
Co-authored-by: Morten Nielsen <[email protected]>
Co-authored-by: Greg De Stigter <[email protected]>
Co-authored-by: Teja Balu <[email protected]>
# Conflicts:
#	.github/workflows/Open_PR.yml
#	src/MAUI/Maui.Samples/Samples/Data/SymbolizeShapefile/SymbolizeShapefile.xaml
#	src/MAUI/Maui.Samples/Samples/Layers/AddClusteringFeatureReductionToAPointFeatureLayer/AddClusteringFeatureReductionToAPointFeatureLayer.xaml
#	src/MAUI/Maui.Samples/Samples/Layers/BrowseWfsLayers/BrowseWfsLayers.xaml
#	src/MAUI/Maui.Samples/Samples/Layers/ChangeSublayerRenderer/ChangeSublayerRenderer.xaml
#	src/MAUI/Maui.Samples/Samples/Layers/RasterRenderingRule/RasterRenderingRule.xaml
#	src/MAUI/Maui.Samples/Samples/Location/ShowLocationHistory/ShowLocationHistory.xaml
#	src/MAUI/Maui.Samples/Samples/Map/OpenMapURL/OpenMapURL.xaml
#	src/MAUI/Maui.Samples/Samples/MapView/ChangeViewpoint/ChangeViewpoint.xaml
#	src/MAUI/Maui.Samples/Samples/MapView/TakeScreenshot/TakeScreenshot.xaml
#	src/MAUI/Maui.Samples/Samples/SceneView/ChooseCameraController/ChooseCameraController.xaml
#	src/MAUI/Maui.Samples/Samples/Symbology/FeatureLayerExtrusion/FeatureLayerExtrusion.xaml
#	src/WPF/WPF.Viewer/ArcGIS.WPF.Viewer.Net.csproj
#	src/WPF/WPF.Viewer/Samples/Layers/AddClusteringFeatureReductionToAPointFeatureLayer/AddClusteringFeatureReductionToAPointFeatureLayer.xaml
#	src/WinUI/ArcGIS.WinUI.Viewer/Samples/Layers/AddClusteringFeatureReductionToAPointFeatureLayer/AddClusteringFeatureReductionToAPointFeatureLayer.xaml
@williambohrmann3
Copy link
Collaborator

@dotMorten can you cherry-pick the commits specific for this PR into a new branch based off updated main? There are old v.next commits which are not present in our main branch due our PR bringing v.next into main at program increment 3, 2023. Although the files changed look good, I'd prefer to keep our commit history as is.

Copy link
Collaborator

@williambohrmann3 williambohrmann3 left a comment

Choose a reason for hiding this comment

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

Thank you for completing this work. Three suggestions:

  1. Cleaned up commit history for your branch for sake of PR cleanliness.
  2. Class rename.
  3. Investigate why the .NET MAUI build failed for our build check job triggered by PRs: https://github.com/Esri/arcgis-maps-sdk-dotnet-samples/blob/main/.github/workflows/BuildSuccess_Check.yaml#L27

src/Samples.Shared/Managers/LicenseStrings.cs Show resolved Hide resolved
Copy link
Collaborator

@duffh duffh left a comment

Choose a reason for hiding this comment

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

Looks good to me but I'm seeing the following error in our MAUI build action.

"D:\a\arcgis-maps-sdk-dotnet-samples\arcgis-maps-sdk-dotnet-samples\src\MAUI\ArcGIS.Samples.MAUI.sln" (Build target) (1:2) ->
"D:\a\arcgis-maps-sdk-dotnet-samples\arcgis-maps-sdk-dotnet-samples\src\MAUI\Maui.Samples\ArcGIS.Samples.Maui.csproj" (default target) (2:22) ->
"D:\a\arcgis-maps-sdk-dotnet-samples\arcgis-maps-sdk-dotnet-samples\src\MAUI\Maui.Samples\ArcGIS.Samples.Maui.csproj" (Build target) (2:32) ->
(ResolveReadyToRunCompilers target) -> 
  C:\Program Files\dotnet\sdk\8.0.100\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Publish.targets(396,5): error NETSDK1094: Unable to optimize assemblies for performance: a valid runtime package was not found. Either set the PublishReadyToRun property to false, or use a supported runtime identifier when publishing. When targeting .NET 6 or higher, make sure to restore packages with the PublishReadyToRun property set to true. [D:\a\arcgis-maps-sdk-dotnet-samples\arcgis-maps-sdk-dotnet-samples\src\MAUI\Maui.Samples\ArcGIS.Samples.Maui.csproj::TargetFramework=net8.0-windows10.0.19041.0]

Do we need to update the script or is this an issue introduced by the updated MAUI project file?

@williambohrmann3
Copy link
Collaborator

No need to clean up commit history, everything will be squashed and merge in the end.

@duffh duffh merged commit d97deb5 into main Jan 22, 2024
6 checks passed
@duffh duffh deleted the dotMorten/cibuild branch January 22, 2024 19:54
github-actions bot pushed a commit that referenced this pull request Jan 22, 2024
Co-authored-by: Hamish Duff <[email protected]>
Co-authored-by: William Bohrmann <[email protected]>
Co-authored-by: Andy Weis <[email protected]>
Co-authored-by: Zack Allen <[email protected]>
Co-authored-by: William Bohrmann <[email protected]>
Co-authored-by: Preeti <[email protected]>
Co-authored-by: Greg De Stigter <[email protected]>
Co-authored-by: Teja Balu <[email protected]>
Co-authored-by: Morten Nielsen <[email protected]>
Co-authored-by: Hamish Duff <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants