Skip to content

Updates build process and docs to include PnP Provisioning. Closes #1853 #1849

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.

Sign up for GitHub

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

Draft
Adam-it wants to merge 1 commit into from
Draft

Updates build process and docs to include PnP Provisioning. Closes #1853 #1849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/workflows/buildandtest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,22 @@ on:
- 'src/sdk/PnP.Core/**'
- 'src/sdk/PnP.Core.Auth/**'
- 'src/sdk/PnP.Core.Admin/**'
- 'src/sdk/PnP.Core.Provisioning/**'
- 'src/sdk/PnP.Core.Test/**'
- 'src/sdk/PnP.Core.Auth.Test/**'
- 'src/sdk/PnP.Core.Admin.Test/**'
- 'src/sdk/PnP.Core.Provisioning.Test/**'
pull_request:
branches: [ dev ]
paths:
- 'src/sdk/PnP.Core/**'
- 'src/sdk/PnP.Core.Auth/**'
- 'src/sdk/PnP.Core.Admin/**'
- 'src/sdk/PnP.Core.Provisioning/**'
- 'src/sdk/PnP.Core.Test/**'
- 'src/sdk/PnP.Core.Auth.Test/**'
- 'src/sdk/PnP.Core.Admin.Test/**'
- 'src/sdk/PnP.Core.Provisioning.Test/**'

jobs:
build:
Expand Down Expand Up @@ -57,7 +61,8 @@ jobs:
dotnet test ./PnP.Core.Test/PnP.Core.Test.csproj --no-restore --verbosity normal --collect:"XPlat Code Coverage"
dotnet test ./PnP.Core.Auth.Test/PnP.Core.Auth.Test.csproj --no-restore --verbosity normal --collect:"XPlat Code Coverage"
dotnet test ./PnP.Core.Admin.Test/PnP.Core.Admin.Test.csproj --no-restore --verbosity normal --collect:"XPlat Code Coverage"
working-directory: src/sdk
dotnet test ./PnP.Core.Provisioning.Test/PnP.Core.Provisioning.Test.csproj --no-restore --verbosity normal --filter TestCategory=Offline --collect:"XPlat Code Coverage"
working-directory: src/sdk
- name: Upload coverage to Codecov 📝
uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
with:
Expand Down
3 changes: 3 additions & 0 deletions build/build-debug.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ dotnet build ..\src\sdk\PnP.Core.Auth\PnP.Core.Auth.csproj --no-incremental /p:V
Write-Host "Building PnP.Core.Admin versions $version"
dotnet build ..\src\sdk\PnP.Core.Admin\PnP.Core.Admin.csproj --no-incremental /p:Version=$version

Write-Host "Building PnP.Core.Provisioning versions $version"
dotnet build ..\src\sdk\PnP.Core.Provisioning\PnP.Core.Provisioning.csproj --no-incremental /p:Version=$version

#Write-Host "Writing $version to git"
#Set-Content -Path .\version.debug.increment -Value $versionIncrement

Expand Down
10 changes: 9 additions & 1 deletion build/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ dotnet build ./src/sdk/PnP.Core.Auth/PnP.Core.Auth.csproj --configuration Releas
Write-Host "Building PnP.Core.Admin version $version"
dotnet build ./src/sdk/PnP.Core.Admin/PnP.Core.Admin.csproj --configuration Release --no-incremental /p:Version=$version

Write-Host "Building PnP.Core.Provisioning version $version"
dotnet build ./src/sdk/PnP.Core.Provisioning/PnP.Core.Provisioning.csproj --configuration Release --no-incremental /p:Version=$version

Write-Host "Packinging PnP.Core version $version"
dotnet pack ./src/sdk/PnP.Core/PnP.Core.csproj --configuration Release --no-build /p:PackageVersion=$version

Expand All @@ -36,17 +39,22 @@ dotnet pack ./src/sdk/PnP.Core.Auth/PnP.Core.Auth.csproj --configuration Release
Write-Host "Packinging PnP.Core.Admin version $version"
dotnet pack ./src/sdk/PnP.Core.Admin/PnP.Core.Admin.csproj --configuration Release --no-build /p:PackageVersion=$version

Write-Host "Packinging PnP.Core.Provisioning version $version"
dotnet pack ./src/sdk/PnP.Core.Provisioning/PnP.Core.Provisioning.csproj --configuration Release --no-build /p:PackageVersion=$version

Write-Host "Publishing to nuget"
$nupkg = $("./src/sdk/PnP.Core/bin/Release/PnP.Core.$version.nupkg")
$authNupkg = $("./src/sdk/PnP.Core.Auth/bin/Release/PnP.Core.Auth.$version.nupkg")
$adminNupkg = $("./src/sdk/PnP.Core.Admin/bin/Release/PnP.Core.Admin.$version.nupkg")
#$provisioningNupkg = $("./src/sdk/PnP.Core.Provisioning/bin/Release/PnP.Core.Provisioning.$version.nupkg")
$apiKey = $("$env:NUGET_API_KEY")

#Write-Host "API Key starts with:" $apiKey.Substring(0,10)

dotnet nuget push $nupkg --api-key $apiKey --source https://api.nuget.org/v3/index.json --timeout 600
dotnet nuget push $nupkg --api-key $apiKey --source https://api.nuget.org/v3/index.json --timeout 600
dotnet nuget push $authNupkg --api-key $apiKey --source https://api.nuget.org/v3/index.json --timeout 600
dotnet nuget push $adminNupkg --api-key $apiKey --source https://api.nuget.org/v3/index.json --timeout 600
#dotnet nuget push $provisioningNupkg --api-key $apiKey --source https://api.nuget.org/v3/index.json --timeout 600

Write-Host "Writing $version to git"
Set-Content -Path ./build/version.debug.increment -Value $versionIncrement
7 changes: 6 additions & 1 deletion build/release-official.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ Write-Host "Building PnP.Core.Auth version $version..."
dotnet build $PSScriptRoot\..\src\sdk\PnP.Core.Auth\PnP.Core.Auth.csproj --configuration Release --no-incremental --force --nologo /p:Version=$version
Write-Host "Building PnP.Core.Admin version $version..."
dotnet build $PSScriptRoot\..\src\sdk\PnP.Core.Admin\PnP.Core.Admin.csproj --configuration Release --no-incremental --force --nologo /p:Version=$version
Write-Host "Building PnP.Core.Provisioning version $version..."
dotnet build $PSScriptRoot\..\src\sdk\PnP.Core.Provisioning\PnP.Core.Provisioning.csproj --configuration Release --no-incremental --force --nologo /p:Version=$version

# Sign the binaries
Write-Host "Signing the binaries..."
Expand All @@ -28,11 +30,13 @@ Write-Host "Packinging PnP.Core.Auth version $version..."
dotnet pack $PSScriptRoot\..\src\sdk\PnP.Core.Auth\PnP.Core.Auth.csproj --configuration Release --no-build /p:PackageVersion=$version
Write-Host "Packinging PnP.Core.Admin version $version..."
dotnet pack $PSScriptRoot\..\src\sdk\PnP.Core.Admin\PnP.Core.Admin.csproj --configuration Release --no-build /p:PackageVersion=$version
Write-Host "Packinging PnP.Core.Provisioning version $version..."
dotnet pack $PSScriptRoot\..\src\sdk\PnP.Core.Provisioning\PnP.Core.Provisioning.csproj --configuration Release --no-build /p:PackageVersion=$version

# Sign the nuget package is not needed as Nuget signs the package automatically

# Publish
Write-host "Verify the created NuGet packages in folders \src\sdk\PnP.Core\bin\release, \src\sdk\PnP.Core.Auth\bin\release and \src\sdk\PnP.Core.Admin\bin\release. If OK enter the nuget API key to publish the package, press enter to cancel." -ForegroundColor Yellow
Write-host "Verify the created NuGet packages in folders \src\sdk\PnP.Core\bin\release, \src\sdk\PnP.Core.Auth\bin\release, \src\sdk\PnP.Core.Admin\bin\release and \src\sdk\PnP.Core.Provisioning\bin\release. If OK enter the nuget API key to publish the package, press enter to cancel." -ForegroundColor Yellow
$apiKey = Read-Host "NuGet API key"

if ($apiKey.Length -gt 0)
Expand All @@ -41,6 +45,7 @@ if ($apiKey.Length -gt 0)
nuget push q:\github\pnpcore\src\sdk\PnP.Core\bin\release\PnP.Core.$version.nupkg -ApiKey $apiKey -source https://api.nuget.org/v3/index.json
nuget push q:\github\pnpcore\src\sdk\PnP.Core.Auth\bin\release\PnP.Core.Auth.$version.nupkg -ApiKey $apiKey -source https://api.nuget.org/v3/index.json
nuget push q:\github\pnpcore\src\sdk\PnP.Core.Admin\bin\release\PnP.Core.Admin.$version.nupkg -ApiKey $apiKey -source https://api.nuget.org/v3/index.json
#nuget push q:\github\pnpcore\src\sdk\PnP.Core.Provisioning\bin\release\PnP.Core.Provisioning.$version.nupkg -ApiKey $apiKey -source https://api.nuget.org/v3/index.json

# Persist last used version
Write-Host "Writing $version to git"
Expand Down
5 changes: 5 additions & 0 deletions build/release-signed-nightly.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ Write-Host "Building PnP.Core.Auth version $version..."
dotnet build $PSScriptRoot\..\src\sdk\PnP.Core.Auth\PnP.Core.Auth.csproj --configuration Release --no-incremental --force --nologo /p:Version=$version
Write-Host "Building PnP.Core.Admin version $version..."
dotnet build $PSScriptRoot\..\src\sdk\PnP.Core.Admin\PnP.Core.Admin.csproj --configuration Release --no-incremental --force --nologo /p:Version=$version
Write-Host "Building PnP.Core.Provisioning version $version..."
dotnet build $PSScriptRoot\..\src\sdk\PnP.Core.Provisioning\PnP.Core.Provisioning.csproj --configuration Release --no-incremental --force --nologo /p:Version=$version

# Sign the binaries
Write-Host "Signing the binaries..."
Expand All @@ -28,6 +30,8 @@ Write-Host "Packinging PnP.Core.Auth version $version..."
dotnet pack $PSScriptRoot\..\src\sdk\PnP.Core.Auth\PnP.Core.Auth.csproj --configuration Release --no-build /p:PackageVersion=$version
Write-Host "Packinging PnP.Core.Admin version $version..."
dotnet pack $PSScriptRoot\..\src\sdk\PnP.Core.Admin\PnP.Core.Admin.csproj --configuration Release --no-build /p:PackageVersion=$version
Write-Host "Packinging PnP.Core.Provisioning version $version..."
dotnet pack $PSScriptRoot\..\src\sdk\PnP.Core.Provisioning\PnP.Core.Provisioning.csproj --configuration Release --no-build /p:PackageVersion=$version

# Sign the nuget package is not needed as Nuget signs the package automatically

Expand All @@ -41,6 +45,7 @@ if ($apiKey.Length -gt 0)
nuget push q:\github\pnpcore\src\sdk\PnP.Core\bin\release\PnP.Core.$version.nupkg -ApiKey $apiKey -source https://api.nuget.org/v3/index.json
nuget push q:\github\pnpcore\src\sdk\PnP.Core.Auth\bin\release\PnP.Core.Auth.$version.nupkg -ApiKey $apiKey -source https://api.nuget.org/v3/index.json
nuget push q:\github\pnpcore\src\sdk\PnP.Core.Admin\bin\release\PnP.Core.Admin.$version.nupkg -ApiKey $apiKey -source https://api.nuget.org/v3/index.json
#nuget push q:\github\pnpcore\src\sdk\PnP.Core.Provisioning\bin\release\PnP.Core.Provisioning.$version.nupkg -ApiKey $apiKey -source https://api.nuget.org/v3/index.json

# Persist last used version
Write-Host "Writing $version to git"
Expand Down
1 change: 1 addition & 0 deletions build/unlist-nightly.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,4 @@ CleanPackage "PnP.Core" 10 $ApiKey
CleanPackage "PnP.Core.Auth" 10 $ApiKey
CleanPackage "PnP.Core.Admin" 10 $ApiKey
CleanPackage "PnP.Framework" 10 $ApiKey
#CleanPackage "PnP.Core.Provisioning" 10 $ApiKey
Loading