Skip to content

Commit de480d0

Browse files
estruyfestruyf
committed
Merge branch 'dev'
2 parents 88327a9 + 90c0fab commit de480d0

Some content is hidden

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

43 files changed

+12149
-10734
lines changed

‎.circleci/config.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
defaults: &defaults
22
working_directory: ~/sp-dev-fx-property-controls
33
docker:
4-
- image: circleci/node:6.11.5
4+
- image: circleci/node:10.22.0
55

66
version: 2
77
jobs:
@@ -104,25 +104,31 @@ workflows:
104104
- build:
105105
filters:
106106
branches:
107-
ignore: /^(dev|master)/
107+
ignore: /^(dev|master|v2)/
108108
release_next:
109109
jobs:
110110
- build:
111111
filters:
112112
branches:
113-
only: dev
113+
only:
114+
- dev
115+
- v2
114116
- build_next:
115117
requires:
116118
- build
117119
filters:
118120
branches:
119-
only: dev
121+
only:
122+
- dev
123+
- v2
120124
- publish_next:
121125
requires:
122126
- build_next
123127
filters:
124128
branches:
125-
only: dev
129+
only:
130+
- dev
131+
- v2
126132
release:
127133
jobs:
128134
- build:

‎.yo-rc.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
{
22
"@microsoft/generator-sharepoint": {
3-
"version": "1.2.0",
3+
"version": "1.11.0",
44
"libraryName": "sp-dev-fx-property-controls",
55
"libraryId": "0253ef52-be23-4282-b00f-e5a9350eb408",
6-
"environment": "spo"
6+
"environment": "spo",
7+
"isDomainIsolated": false,
8+
"isCreatingSolution": true,
9+
"packageManager": "npm",
10+
"componentType": "webpart"
711
}
812
}

‎CHANGELOG.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
{
22
"versions": [
3+
{
4+
"version": "2.0.0",
5+
"changes": {
6+
"new": [
7+
"`Office UI Fabric` version 6 support"
8+
],
9+
"enhancements": [],
10+
"fixes": []
11+
},
12+
"contributions": []
13+
},
314
{
415
"version": "1.20.0",
516
"changes": {

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Releases
22

3+
## 2.0.0
4+
5+
### New control(s)
6+
7+
- `Office UI Fabric` version 6 support
8+
39
## 1.20.0
410

511
### New control(s)

‎config/config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://dev.office.com/json-schemas/spfx-build/config.2.0.schema.json",
2+
"$schema": "https://developer.office.com/json-schemas/spfx-build/config.2.0.schema.json",
33
"version": "2.0",
44
"bundles": {
55
"property-controls-test-web-part": {

‎config/copy-assets.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"$schema": "https://dev.office.com/json-schemas/spfx-build/copy-assets.schema.json",
2+
"$schema": "https://developer.office.com/json-schemas/spfx-build/copy-assets.schema.json",
33
"deployCdnPath": "temp/deploy"
44
}

‎config/deploy-azure-storage.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"$schema": "https://dev.office.com/json-schemas/spfx-build/deploy-azure-storage.schema.json",
2+
"$schema": "https://developer.office.com/json-schemas/spfx-build/deploy-azure-storage.schema.json",
33
"workingDir": "./temp/deploy/",
44
"account": "<!-- STORAGE ACCOUNT NAME -->",
55
"container": "sp-dev-fx-property-controls",
66
"accessKey": "<!-- ACCESS KEY -->"
7-
}
7+
}

‎config/package-solution.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
{
2-
"$schema": "https://dev.office.com/json-schemas/spfx-build/package-solution.schema.json",
2+
"$schema": "https://developer.office.com/json-schemas/spfx-build/package-solution.schema.json",
33
"solution": {
44
"name": "sp-dev-fx-property-controls-client-side-solution",
55
"id": "0253ef52-be23-4282-b00f-e5a9350eb408",
66
"version": "1.0.0.0",
7-
"skipFeatureDeployment": true
7+
"skipFeatureDeployment": true,
8+
"isDomainIsolated": false,
9+
"includeClientSideAssets": true
810
},
911
"paths": {
1012
"zippedPackage": "solution/sp-dev-fx-property-controls.sppkg"

‎config/serve.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://dev.office.com/json-schemas/core-build/serve.schema.json",
2+
"$schema": "https://developer.microsoft.com/json-schemas/core-build/serve.schema.json",
33
"port": 4321,
44
"initialPage": "https://localhost:5432/workbench",
55
"https": true,

‎config/tslint.json‎

Lines changed: 0 additions & 40 deletions
This file was deleted.

0 commit comments

Comments
 (0)