Skip to content

Commit 7b654a8

Browse files
committed
Update min version and pipelines
1 parent 8f15fc0 commit 7b654a8

File tree

3 files changed

+71
-7
lines changed

3 files changed

+71
-7
lines changed

.github/workflows/main.yml

Lines changed: 59 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1414
jobs:
1515
codegen:
16-
runs-on: windows-2019
16+
runs-on: windows-2022
1717
steps:
1818
- name: setup git
1919
run: |
@@ -22,6 +22,9 @@ jobs:
2222
2323
- uses: actions/checkout@v2
2424

25+
- name: yarn install
26+
run: yarn install
27+
2528
- uses: nuget/setup-nuget@v1
2629

2730
- name: NuGet restore
@@ -31,6 +34,9 @@ jobs:
3134
run: dotnet run -verbose -winmd ..\..\example\windows\packages\Microsoft.UI.Xaml.2.6.0\lib\uap10.0\Microsoft.UI.Xaml.winmd
3235
working-directory: package\Codegen
3336

37+
- name: build TS
38+
run: yarn build
39+
3440
- name: verify no changes from CodeGen
3541
shell: powershell
3642
run: |
@@ -42,6 +48,7 @@ jobs:
4248
runs-on: windows-2022
4349
steps:
4450
- uses: actions/checkout@v2
51+
4552
- name: yarn install
4653
run: yarn install
4754

@@ -60,15 +67,63 @@ jobs:
6067
if-no-files-found: error
6168

6269

63-
testcli:
70+
testcli-old:
6471
runs-on: windows-2019
6572
strategy:
6673
fail-fast: false
6774
matrix:
6875
rnwSource: ['Source', 'NuGet'] # test building with both RNW source and RNW NuGet
69-
rnwVersion: ['^0.64', '^0.67', '^0.69'] # test key versions (min, partners)
76+
rnwVersion: ['^0.67', '^0.69'] # test key versions (min, partners)
7077
steps:
7178
- uses: actions/checkout@v2
79+
80+
- name: yarn install
81+
run: yarn install
82+
83+
- name: build TS
84+
run: yarn build
85+
86+
- name: yarn link
87+
run: yarn link
88+
working-directory: package
89+
90+
- name: create ${{ matrix.rnwVersion }} app
91+
run: npx react-native init testrnx --template react-native@${{ matrix.rnwVersion }}
92+
93+
- name: add Windows (RNW via ${{ matrix.rnwSource }})
94+
run: npx react-native-windows-init --overwrite ${{ matrix.rnwSource == 'NuGet' && '--experimentalNuGetDependency true' || '' }}
95+
working-directory: testrnx
96+
97+
- name: link react-native-xaml
98+
run: yarn link react-native-xaml
99+
working-directory: testrnx
100+
101+
- name: add react-native-xaml
102+
run: yarn add react-native-xaml
103+
working-directory: testrnx
104+
105+
- name: autolink
106+
run: npx react-native autolink-windows --logging
107+
working-directory: testrnx
108+
109+
- name: update WinUI package version
110+
run: ..\.github\workflows\SetUpAppForNuget.ps1 ${{ matrix.rnwSource == 'NuGet' && '-UseNuGet' || '' }}
111+
working-directory: testrnx
112+
113+
- name: build app
114+
run: npx react-native run-windows --no-launch --no-deploy --no-packager --logging
115+
working-directory: testrnx
116+
117+
testcli:
118+
runs-on: windows-2022
119+
strategy:
120+
fail-fast: false
121+
matrix:
122+
rnwSource: ['Source', 'NuGet'] # test building with both RNW source and RNW NuGet
123+
rnwVersion: ['^0.71'] # test key versions (latest)
124+
steps:
125+
- uses: actions/checkout@v2
126+
72127
- name: yarn install
73128
run: yarn install
74129

@@ -107,7 +162,7 @@ jobs:
107162
working-directory: testrnx
108163

109164
package:
110-
runs-on: windows-2019
165+
runs-on: windows-2022
111166
steps:
112167
- uses: actions/checkout@v2
113168

.github/workflows/publish.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,25 @@ jobs:
1414

1515
steps:
1616
- uses: actions/checkout@v2
17+
1718
- uses: nuget/setup-nuget@v1
19+
1820
- name: setup-msbuild
1921
uses: microsoft/setup-msbuild@v1
2022

23+
- name: yarn install
24+
run: yarn install
25+
2126
- name: NuGet restore
2227
run: nuget restore example\windows\example.sln
2328

2429
- name: run CodeGen
2530
run: dotnet run -verbose -winmd ..\..\example\windows\packages\Microsoft.UI.Xaml.2.6.0\lib\uap10.0\Microsoft.UI.Xaml.winmd
2631
working-directory: package\Codegen
2732

33+
- name: build TS
34+
run: yarn build
35+
2836
- name: verify no changes from CodeGen
2937
shell: powershell
3038
run: |
@@ -37,6 +45,7 @@ jobs:
3745

3846
steps:
3947
- uses: actions/checkout@v2
48+
4049
- name: Use Node.js
4150
uses: actions/setup-node@v1
4251
with:

package/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
"typescript": "^4.4.3"
3838
},
3939
"peerDependencies": {
40-
"react": ">= 17.0.1",
41-
"react-native": ">= 0.64.2",
42-
"react-native-windows": ">= 0.64.5",
40+
"react": ">= 17.0.2",
41+
"react-native": ">= 0.67.0",
42+
"react-native-windows": ">= 0.67.11",
4343
"typescript": "^4.1.2"
4444
},
4545
"devDependencies": {

0 commit comments

Comments
 (0)