Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
2d74122
update HC to 12.18
seantleonard Feb 24, 2023
689d668
upgrade hotchocolae version and add notice
seantleonard Feb 27, 2023
c3dc48b
Manual notice file.
seantleonard Feb 27, 2023
e3d45c3
Add BCP license
seantleonard Feb 27, 2023
4026694
Update src/Directory.Packages.props
seantleonard Feb 27, 2023
acfcd3a
Add Powershell script for build pipeline to concatenate license to NO…
seantleonard Feb 27, 2023
d7fa91f
Merge branch 'dev/seleonar/bcp_newlicense' of https://github.com/Azur…
seantleonard Feb 27, 2023
11f1d3e
Merge branch 'main' into dev/seleonar/bcp_newlicense
seantleonard Feb 27, 2023
3a2e351
explicit file not just path.
seantleonard Feb 27, 2023
803f5bf
Merge branch 'dev/seleonar/bcp_newlicense' of https://github.com/Azur…
seantleonard Feb 27, 2023
9bdf9c0
add explicit parameter publishLocation pipeline to publish pipline ar…
seantleonard Feb 27, 2023
f6f82d9
Merge branch 'main' into dev/seleonar/bcp_newlicense
seantleonard Feb 28, 2023
8858c45
updated script name to be kebob case and moved script to scripts fold…
seantleonard Feb 28, 2023
1eebeeb
Merge branch 'dev/seleonar/bcp_newlicense' of https://github.com/Azur…
seantleonard Feb 28, 2023
5f5f183
add Component Name to the concatenated license.
seantleonard Feb 28, 2023
9e46b64
add copyright per BCP webpage.
seantleonard Feb 28, 2023
3f1cb36
Merge branch 'main' into dev/seleonar/bcp_newlicense
seantleonard Feb 28, 2023
79c3365
using text "copyright" instead of symbol as it is converted away in p…
seantleonard Feb 28, 2023
8f7345e
Merge branch 'dev/seleonar/bcp_newlicense' of https://github.com/Azur…
seantleonard Feb 28, 2023
10af8ee
Newline and copyright text
seantleonard Feb 28, 2023
118db42
Merge branch 'main' into dev/seleonar/bcp_newlicense
seantleonard Feb 28, 2023
16f2b3a
Merge branch 'main' into dev/seleonar/bcp_newlicense
seantleonard Mar 1, 2023
ac73050
Merge branch 'main' into dev/seleonar/bcp_newlicense
seantleonard Mar 1, 2023
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
9 changes: 9 additions & 0 deletions .pipelines/build-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,14 @@ steps:
outputfile: $(Build.SourcesDirectory)/NOTICE.txt
outputformat: text

- task: PowerShell@2
displayName: "Add ChilliCream License for Banana Cake Pop"
inputs:
targetType: 'filePath'
filePath: $(System.DefaultWorkingDirectory)/scripts/notice-generation.ps1
# Artifact Staging Directory used to temporarily store downloaded ChilliCream license.
arguments: $(Build.ArtifactStagingDirectory) $(Build.SourcesDirectory)

- template: templates/code-signing.yml
parameters:
# This is the path that will be used for packing nuget package.
Expand Down Expand Up @@ -187,6 +195,7 @@ steps:
displayName: "Upload build artifacts"
inputs:
targetPath: '$(Build.ArtifactStagingDirectory)'
publishLocation: 'pipeline'

- task: NuGetCommand@2
displayName: 'Publish Nuget to Internal Feed'
Expand Down
21 changes: 21 additions & 0 deletions scripts/notice-generation.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.

param (
[Parameter (Mandatory=$true)][string] $BuildArtifactStagingDir,
[Parameter (Mandatory=$true)][string] $BuildSourcesDir
)

# Download and save the ChilliCream License 1.0 from ChilliCream/graphql-platform GitHub repo
$chiliCreamLicenseSavePath = "$BuildArtifactStagingDir/chillicreamlicense.txt"
$chiliCreamLicenseMetadataURL = "https://raw.githubusercontent.com/ChilliCream/graphql-platform/main/website/src/basic/licensing/chillicream-license.md"
Invoke-WebRequest $chiliCreamLicenseMetadataURL `
| Select-Object -ExpandProperty Content `
| Out-File $chiliCreamLicenseSavePath

# Concatenate existing NOTICE.txt file with Chilicream license.
$noticeFilePath = "$BuildSourcesDir/NOTICE.txt"
# Add newline before and after to meet formatting requirements
Add-Content $noticeFilePath -Value "`r`nBanana Cake Pop`r`n"
Add-Content $noticeFilePath -Value "Copyright 2023 ChilliCream, Inc.`r`n"
Add-Content $noticeFilePath -Value (Get-Content $chiliCreamLicenseSavePath)
62 changes: 31 additions & 31 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,36 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
<PackageVersion Include="coverlet.msbuild" Version="3.2.0" />
<PackageVersion Include="coverlet.collector" Version="3.2.0" />
<PackageVersion Include="HotChocolate" Version="12.15.1" />
<PackageVersion Include="HotChocolate.AspNetCore" Version="12.15.1" />
<PackageVersion Include="HotChocolate.AspNetCore.Authorization" Version="12.15.1" />
<PackageVersion Include="Humanizer" Version="2.14.1" />
<PackageVersion Include="Humanizer.Core" Version="2.14.1" />
<PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="6.0.10" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.10" />
<PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.10" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="6.0.10" />
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.20.0" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.0.1" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageVersion Include="Microsoft.OData.Edm" Version="7.12.5" />
<PackageVersion Include="Microsoft.OData.Core" Version="7.12.5" />
<PackageVersion Include="Moq" Version="4.18.2" />
<PackageVersion Include="MSTest.TestAdapter" Version="2.2.10" />
<PackageVersion Include="MSTest.TestFramework" Version="2.2.10" />
<PackageVersion Include="MySqlConnector" Version="2.1.5" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.2" />
<PackageVersion Include="Npgsql" Version="7.0.1" />
<PackageVersion Include="Polly" Version="7.2.3" />
<PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
<PackageVersion Include="System.Drawing.Common" Version="6.0.0" />
<PackageVersion Include="System.IO.Abstractions" Version="17.2.3" />
<PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="17.2.3" />
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
<PackageVersion Include="coverlet.msbuild" Version="3.2.0" />
<PackageVersion Include="coverlet.collector" Version="3.2.0" />
<PackageVersion Include="HotChocolate" Version="12.18.0" />
<PackageVersion Include="HotChocolate.AspNetCore" Version="12.18.0" />
<PackageVersion Include="HotChocolate.AspNetCore.Authorization" Version="12.18.0" />
<PackageVersion Include="Humanizer" Version="2.14.1" />
<PackageVersion Include="Humanizer.Core" Version="2.14.1" />
<PackageVersion Include="Microsoft.AspNetCore.Authorization" Version="6.0.10" />
<PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.10" />
<PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.10" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="6.0.10" />
<PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.20.0" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="5.0.1" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
<PackageVersion Include="Microsoft.OData.Edm" Version="7.12.5" />
<PackageVersion Include="Microsoft.OData.Core" Version="7.12.5" />
<PackageVersion Include="Moq" Version="4.18.2" />
<PackageVersion Include="MSTest.TestAdapter" Version="2.2.10" />
<PackageVersion Include="MSTest.TestFramework" Version="2.2.10" />
<PackageVersion Include="MySqlConnector" Version="2.1.5" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.2" />
<PackageVersion Include="Npgsql" Version="7.0.1" />
<PackageVersion Include="Polly" Version="7.2.3" />
<PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
<PackageVersion Include="System.Drawing.Common" Version="6.0.0" />
<PackageVersion Include="System.IO.Abstractions" Version="17.2.3" />
<PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="17.2.3" />
</ItemGroup>
</Project>