Skip to content

Commit 22174b3

Browse files
acoumbacoumb
authored
Merge pull request #291 from umbraco/feature/v17/shopify
Feature/v17/shopify
2 parents 1be6f0e + 3c7558a commit 22174b3

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+2703
-1088
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -487,3 +487,5 @@ $RECYCLE.BIN/
487487
# Umbraco specific gitignore
488488
#
489489
**/config.outputPath.js
490+
491+
appsettings.Local.json

‎NuGet.config‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<clear />
5+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
6+
<add key="Umbraco Prereleases" value="https://www.myget.org/F/umbracoprereleases/api/v3/index.json" />
7+
</packageSources>
8+
</configuration>

‎Umbraco.Cms.Integrations.sln‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@ VisualStudioVersion = 18.0.11111.16
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2801CB6C-78DE-4129-B5C6-D349F47F9B5C}"
77
ProjectSection(SolutionItems) = preProject
8+
.gitignore = .gitignore
89
azure-pipeline - Crm.ActiveCampaign.yml = azure-pipeline - Crm.ActiveCampaign.yml
910
azure-pipeline - Crm.Dynamics.yml = azure-pipeline - Crm.Dynamics.yml
1011
azure-pipeline - Crm.Hubspot.yml = azure-pipeline - Crm.Hubspot.yml
1112
azure-pipeline - Search.Algolia.yml = azure-pipeline - Search.Algolia.yml
1213
azure-pipeline - SEO.SemrushTools.yml = azure-pipeline - SEO.SemrushTools.yml
1314
azure-pipelines - Automation.Zapier.yml = azure-pipelines - Automation.Zapier.yml
1415
azure-pipelines - Commerce.Shopify.yml = azure-pipelines - Commerce.Shopify.yml
16+
NuGet.config = NuGet.config
1517
README.md = README.md
1618
EndProjectSection
1719
EndProject

‎azure-pipelines - Commerce.Shopify.yml‎

Lines changed: 37 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
trigger:
22
branches:
33
include:
4-
- main-v16
5-
- v16/dev
4+
- main-v17
5+
- v17/dev
66
paths:
77
include:
88
- src/Umbraco.Cms.Integrations.Commerce.Shopify/**
@@ -16,24 +16,28 @@ variables:
1616
project: 'src/$(projectName)/$(projectName).csproj'
1717
buildPlatform: 'Any CPU'
1818
buildConfiguration: 'Release'
19+
productGroup: 'DXP'
20+
productVersion: 'v17'
21+
DT_API_KEY: $(dtApiKey)
22+
DT_BASE_URL: $(dtBaseUrl)
1923

2024
steps:
25+
- task: UseDotNet@2
26+
displayName: 'Use SDK version 10.0.100'
27+
inputs:
28+
packageType: 'sdk'
29+
version: '10.0.100'
30+
2131
- task: NuGetToolInstaller@1
2232
displayName: 'Install NuGet'
2333

2434
- task: DotNetCoreCLI@2
2535
displayName: 'NuGet Restore'
2636
inputs:
2737
command: 'restore'
28-
feedsToUse: 'select'
38+
feedsToUse: 'config'
2939
projects: '$(project)'
30-
includeNuGetOrg: true
31-
32-
- task: UseDotNet@2
33-
displayName: 'Use SDK version 9.0.203'
34-
inputs:
35-
packageType: 'sdk'
36-
version: '9.0.203'
40+
nugetConfigPath: 'NuGet.config'
3741

3842
- task: VSBuild@1
3943
displayName: 'Build Project'
@@ -72,3 +76,26 @@ steps:
7276
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
7377
ArtifactName: 'drop'
7478
publishLocation: 'Container'
79+
80+
# Generate/upload SBOM with cdxgen
81+
- script: |
82+
cd $(Build.SourcesDirectory)
83+
npm install --global @cyclonedx/cdxgen
84+
displayName: 'Install cdxgen'
85+
86+
- script: |
87+
mkdir -p $(Build.ArtifactStagingDirectory)/bom
88+
cd $(Build.SourcesDirectory)
89+
90+
cdxgen --recurse --output $(Build.ArtifactStagingDirectory)\bom\bom.json --json-pretty --project-group "$(productGroup)" --project-name "$(projectName)" --project-version "$(productVersion)" --server-url "$(DT_BASE_URL)" --api-key "$(DT_API_KEY)" --deep
91+
displayName: 'Generate & Upload SBOM with cdxgen'
92+
env:
93+
DT_API_KEY: $(DT_API_KEY)
94+
DT_BASE_URL: $(DT_BASE_URL)
95+
96+
# Publish SBOM artifact
97+
- task: PublishPipelineArtifact@1
98+
displayName: 'Publish SBOM Artifact'
99+
inputs:
100+
targetPath: $(Build.ArtifactStagingDirectory)/bom
101+
artifactName: SBOM

‎examples/Umbraco.Cms.Integrations.Testsite.V17/Program.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
22

3+
#if DEBUG
4+
builder.Configuration.AddJsonFile("appsettings.Local.json", optional: true, reloadOnChange: true);
5+
#endif
6+
37
builder.CreateUmbracoBuilder()
48
.AddBackOffice()
59
.AddWebsite()

‎examples/Umbraco.Cms.Integrations.Testsite.V17/Properties/launchSettings.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"IIS Express": {
1313
"commandName": "IISExpress",
1414
"launchBrowser": true,
15+
"launchUrl": "umbraco",
1516
"environmentVariables": {
1617
"ASPNETCORE_ENVIRONMENT": "Development"
1718
}

‎examples/Umbraco.Cms.Integrations.Testsite.V17/Umbraco.Cms.Integrations.Testsite.V17.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
33
<TargetFramework>net10.0</TargetFramework>
44
<ImplicitUsings>enable</ImplicitUsings>
@@ -7,7 +7,8 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Umbraco.Cms" Version="17.0.0-beta" />
10+
<PackageReference Include="Umbraco.Cms" Version="17.0.0" />
11+
<ProjectReference Include="..\..\src\Umbraco.Cms.Integrations.Commerce.Shopify\Umbraco.Cms.Integrations.Commerce.Shopify.csproj" />
1112
</ItemGroup>
1213

1314
<ItemGroup>

‎examples/Umbraco.Cms.Integrations.Testsite.V17/appsettings.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
}
1111
}
1212
},
13+
"ConnectionStrings": {
14+
"umbracoDbDSN": "Data Source=|DataDirectory|/Umbraco.sqlite.db;Cache=Shared;Foreign Keys=True;Pooling=True",
15+
"umbracoDbDSN_ProviderName": "Microsoft.Data.Sqlite"
16+
},
1317
"Umbraco": {
1418
"CMS": {
1519
"Global": {

‎src/Umbraco.Cms.Integrations.Commerce.Shopify/Client/.npmrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@umbraco-cms:registry=https://www.myget.org/F/umbracoprereleases/npm/

‎src/Umbraco.Cms.Integrations.Commerce.Shopify/Client/generated/client.gen.ts‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
// This file is auto-generated by @hey-api/openapi-ts
22

3-
import type { ClientOptions } from './types.gen';
4-
import { type Config, type ClientOptions as DefaultClientOptions, createClient, createConfig } from '@hey-api/client-fetch';
3+
import { type ClientOptions, type Config, createClient, createConfig } from '@hey-api/client-fetch';
4+
5+
import type { ClientOptions as ClientOptions2 } from './types.gen';
56

67
/**
78
* The `createClientConfig()` function will be called on client initialization
@@ -11,9 +12,9 @@ import { type Config, type ClientOptions as DefaultClientOptions, createClient,
1112
* `setConfig()`. This is useful for example if you're using Next.js
1213
* to ensure your client always has the correct values.
1314
*/
14-
export type CreateClientConfig<T extends DefaultClientOptions = ClientOptions> = (override?: Config<DefaultClientOptions & T>) => Config<Required<DefaultClientOptions> & T>;
15+
export type CreateClientConfig<T extends ClientOptions = ClientOptions2> = (override?: Config<ClientOptions & T>) => Config<Required<ClientOptions> & T>;
1516

16-
export const client = createClient(createConfig<ClientOptions>({
17-
baseUrl: 'http://localhost:30450',
17+
export const client = createClient(createConfig<ClientOptions2>({
18+
baseUrl: 'http://localhost:28157',
1819
throwOnError: true
19-
}));
20+
}));

0 commit comments

Comments
 (0)