Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.

Commit 6d2d2d9

Browse files
Update macOS build image (#1909)
* Update azure-pipelines.yml * Fix build --------- Co-authored-by: Vladislav Antonyuk <[email protected]>
1 parent b55322a commit 6d2d2d9

File tree

2 files changed

+29
-21
lines changed

2 files changed

+29
-21
lines changed

azure-pipelines.yml

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ variables:
1717
PathToSamplesSln: 'samples/XCT.Sample.sln'
1818
PathToCommunityToolkitUnitTestCsproj: 'src/CommunityToolkit/Xamarin.CommunityToolkit.UnitTests/Xamarin.CommunityToolkit.UnitTests.csproj'
1919
PathToMarkupUnitTestCsproj: 'src/Markup/Xamarin.CommunityToolkit.Markup.UnitTests/Xamarin.CommunityToolkit.Markup.UnitTests.csproj'
20-
PathToMsBuildOnMacOS: 'mono /Applications/Visual\ studio.app/Contents/Resources/lib/monodevelop/bin/MSBuild/Current/bin/MSBuild.dll'
2120
Codeql.Enabled: true
2221

2322
resources:
@@ -349,16 +348,35 @@ jobs:
349348
version: $(NETCORE_TEST_VERSION_2_1)
350349
includePreviewVersions: false
351350

352-
- task: CmdLine@2
353-
displayName: 'Build Markup'
351+
# restore, build and pack the packages
352+
- task: MSBuild@1
353+
displayName: Build Xamarin.CommunityToolkit.csproj
354354
inputs:
355-
script: '$(PathToMsBuildOnMacOS) $(PathToMarkupCsproj) /p:Configuration=Release /restore /t:Build /p:ContinuousIntegrationBuild=true /p:Deterministic=false'
356-
357-
- task: CmdLine@2
358-
displayName: 'Build Community Toolkit'
355+
solution: $(PathToCommunityToolkitCsproj)
356+
configuration: Release
357+
msbuildArguments: '/restore /t:Build /p:ContinuousIntegrationBuild=true /p:Deterministic=false'
358+
359+
- task: MSBuild@1
360+
displayName: Pack Community Toolkit NuGets
359361
inputs:
360-
script: '$(PathToMsBuildOnMacOS) $(PathToCommunityToolkitCsproj) /p:Configuration=Release /restore /t:Build /p:ContinuousIntegrationBuild=true /p:Deterministic=false'
361-
362+
solution: $(PathToCommunityToolkitCsproj)
363+
configuration: Release
364+
msbuildArguments: '/t:Pack /p:PackageVersion=$(NugetPackageVersion)'
365+
366+
- task: MSBuild@1
367+
displayName: Build Markup Project
368+
inputs:
369+
solution: $(PathToMarkupCsproj)
370+
configuration: Release
371+
msbuildArguments: '/restore /t:Build /p:ContinuousIntegrationBuild=true /p:Deterministic=false'
372+
373+
- task: MSBuild@1
374+
displayName: Pack Markup NuGet
375+
inputs:
376+
solution: $(PathToMarkupCsproj)
377+
configuration: Release
378+
msbuildArguments: '/t:Pack /p:PackageVersion=$(NugetPackageVersion)'
379+
362380
- task: CmdLine@2
363381
displayName: 'Run Markup Unit Tests'
364382
inputs:
@@ -368,16 +386,6 @@ jobs:
368386
displayName: 'Run Community Toolkit Unit Tests'
369387
inputs:
370388
script: 'dotnet test $(PathToCommunityToolkitUnitTestCsproj) -c Release -p:BuildInParallel=false'
371-
372-
- task: CmdLine@2
373-
displayName: 'Pack Markup NuGets'
374-
inputs:
375-
script: '$(PathToMsBuildOnMacOS) $(PathToMarkupUnitTestCsproj) /p:Configuration=Release /t:Pack /p:PackageVersion=$(NugetPackageVersion)'
376-
377-
- task: CmdLine@2
378-
displayName: 'Pack CommunityToolkit NuGets'
379-
inputs:
380-
script: '$(PathToMsBuildOnMacOS) $(PathToCommunityToolkitCsproj) /p:Configuration=Release /t:Pack /p:PackageVersion=$(NugetPackageVersion)'
381389

382390
- ${{ if eq(variables['System.TeamProject'], 'devdiv') }}:
383391
- template: sign-artifacts/jobs/v2.yml@internal-templates

src/CommunityToolkit/Xamarin.CommunityToolkit/Views/MediaElement/MacOS/MediaElementRenderer.macos.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ protected virtual void UpdateSource()
7878
}
7979
else if (uriSource.Uri != null)
8080
{
81-
asset = AVUrlAsset.Create(NSUrl.FromString(uriSource.Uri.AbsoluteUri));
81+
asset = AVUrlAsset.Create(NSUrl.FromString(uriSource.Uri.AbsoluteUri) ?? throw new ArgumentException("Invalid Uri", "Source"));
8282
}
8383
else
8484
{
@@ -88,7 +88,7 @@ protected virtual void UpdateSource()
8888
else
8989
{
9090
if (Element.Source is XCT.FileMediaSource fileSource)
91-
asset = AVAsset.FromUrl(NSUrl.FromFilename(fileSource.File));
91+
asset = AVAsset.FromUrl(NSUrl.FromFilename(fileSource.File ?? throw new ArgumentException("Invalid file", "Source")));
9292
}
9393

9494
_ = asset ?? throw new NullReferenceException();

0 commit comments

Comments
 (0)