diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 69e68816a..6c00d22c3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -138,8 +138,11 @@ jobs: with: dotnet-version: "6.0.x" + - name: Install .NET workloads + run: dotnet workload install ios + # Contrary to seemingly any other msbuild, msbuild running on macOS/Mono # cannot accept .sln(f) files as arguments. # Build just the iOS framework project for now. - name: Build - run: msbuild osu.Framework.iOS/osu.Framework.iOS.csproj /restore /p:Configuration=Debug + run: dotnet build -c Debug osu-framework.iOS.slnf diff --git a/.github/workflows/deploy-pack.yml b/.github/workflows/deploy-pack.yml index 5ca24963e..c60d8cb6b 100644 --- a/.github/workflows/deploy-pack.yml +++ b/.github/workflows/deploy-pack.yml @@ -146,8 +146,16 @@ jobs: id: artifactsPath run: echo "::set-output name=NUGET_ARTIFACTS::${{github.workspace}}/artifacts" + - name: Install .NET 6.0.x + uses: actions/setup-dotnet@v1 + with: + dotnet-version: "6.0.x" + + - name: Install .NET workloads + run: dotnet workload install ios + - name: Pack (iOS Framework) - run: msbuild -bl:msbuildlog.binlog -v:m -target:Pack -r osu.Framework.iOS/osu.Framework.iOS.csproj -p:Configuration=Release -p:Version=${{needs.check-if-tag.outputs.version}} -p:PackageOutputPath=${{steps.artifactsPath.outputs.nuget_artifacts}} + run: dotnet pack -c Release osu.Framework.iOS /p:Version=${{needs.check-if-tag.outputs.version}} /p:GenerateDocumentationFile=true -o ${{steps.artifactsPath.outputs.nuget_artifacts}} - name: Upload Artifacts uses: actions/upload-artifact@v2 diff --git a/build.ps1 b/build.ps1 index 8cd8b61c0..44b7a6048 100755 --- a/build.ps1 +++ b/build.ps1 @@ -22,7 +22,7 @@ if ($Experimental) { $cakeArguments += "-experimental" } $cakeArguments += $ScriptArgs dotnet tool restore -dotnet workload install android +dotnet workload restore dotnet cake ./build/build.cake --bootstrap dotnet cake ./build/build.cake $cakeArguments -exit $LASTEXITCODE \ No newline at end of file +exit $LASTEXITCODE diff --git a/build.sh b/build.sh index 1ea49a4b1..abb813db3 100755 --- a/build.sh +++ b/build.sh @@ -1,6 +1,6 @@ echo "Installing Cake.Tool..." dotnet tool restore -dotnet workload install android +dotnet workload restore # Parse arguments. CAKE_ARGUMENTS=() @@ -15,4 +15,4 @@ done echo "Running build script..." dotnet cake ./build/build.cake --bootstrap -dotnet cake ./build/build.cake "${CAKE_ARGUMENTS[@]}" \ No newline at end of file +dotnet cake ./build/build.cake "${CAKE_ARGUMENTS[@]}" diff --git a/build/build.cake b/build/build.cake index 218934da3..3d3d8cb45 100644 --- a/build/build.cake +++ b/build/build.cake @@ -144,22 +144,16 @@ Task("PackFramework") Task("PackiOSFramework") .Does(() => { - MSBuild(iosFrameworkProject, new MSBuildSettings { - Restore = true, - BinaryLogger = new MSBuildBinaryLogSettings{ - Enabled = true, - FileName = tempDirectory.CombineWithFilePath("msbuildlog.binlog").FullPath - }, - Verbosity = Verbosity.Minimal, - ArgumentCustomization = args => - { - args.Append($"/p:Configuration={configuration}"); + DotNetCorePack(iosFrameworkProject.FullPath, new DotNetCorePackSettings{ + OutputDirectory = artifactsDirectory, + Configuration = configuration, + Verbosity = DotNetCoreVerbosity.Quiet, + ArgumentCustomization = args => { args.Append($"/p:Version={version}"); - args.Append($"/p:PackageOutputPath={artifactsDirectory.MakeAbsolute(Context.Environment)}"); - + args.Append($"/p:GenerateDocumentationFile=true"); return args; } - }.WithTarget("Pack")); + }); }); Task("PackAndroidFramework")