Skip to content

Commit 2cb787e

Browse files
niels9001niels9001
authored
Merge branch 'main' into niels9001/titlebar-experiment
2 parents c4d5b38 + b223286 commit 2cb787e

29 files changed

+70
-93
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"uno.check": {
6-
"version": "1.18.1",
6+
"version": "1.20.2",
77
"commands": [
88
"uno-check"
99
]
@@ -15,7 +15,7 @@
1515
]
1616
},
1717
"microsoft.visualstudio.slngen.tool": {
18-
"version": "9.5.4",
18+
"version": "11.2.3",
1919
"commands": [
2020
"slngen"
2121
]

‎.devcontainer/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.208.0/containers/dotnet/.devcontainer/base.Dockerfile
22

3-
# [Choice] .NET version: 6.0, 5.0, 3.1, 6.0-bullseye, 5.0-bullseye, 3.1-bullseye, 6.0-focal, 5.0-focal, 3.1-focal
4-
ARG VARIANT="6.0-bullseye-slim"
3+
# [Choice] .NET version: 6.0, 5.0, 3.1, 6.0-bullseye, 5.0-bullseye, 3.1-bullseye, 6.0-focal, 5.0-focal, 3.1-focal, etc
4+
ARG VARIANT="8.0-bullseye-slim"
55
FROM mcr.microsoft.com/vscode/devcontainers/dotnet:0-${VARIANT}
66

77
# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"settings": {},
1717
// Add the IDs of extensions you want installed when the container is created.
1818
"extensions": [
19-
"ms-dotnettools.csharp",
19+
"ms-dotnettools.csdevkit",
2020
"unoplatform.vscode",
2121
"ms-vsliveshare.vsliveshare",
2222
"ms-vscode.powershell"

‎.github/workflows/build.yml‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
merge_group:
1818

1919
env:
20-
DOTNET_VERSION: ${{ '7.0.402' }}
20+
DOTNET_VERSION: ${{ '8.0.201' }}
2121
ENABLE_DIAGNOSTICS: false
2222
#COREHOST_TRACE: 1
2323
MSBUILD_VERBOSITY: normal
@@ -34,13 +34,13 @@ jobs:
3434
# Steps represent a sequence of tasks that will be executed as part of the job
3535
steps:
3636
- name: Install .NET SDK v${{ env.DOTNET_VERSION }}
37-
uses: actions/setup-dotnet@v3
37+
uses: actions/setup-dotnet@v4
3838
with:
3939
dotnet-version: ${{ env.DOTNET_VERSION }}
4040

4141
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
4242
- name: Checkout Repository
43-
uses: actions/checkout@v3
43+
uses: actions/checkout@v4
4444
with:
4545
submodules: recursive
4646

@@ -72,7 +72,7 @@ jobs:
7272
# Steps represent a sequence of tasks that will be executed as part of the job
7373
steps:
7474
- name: Configure Pagefile
75-
uses: al-cheb/configure-pagefile-action@v1.2
75+
uses: al-cheb/configure-pagefile-action@v1.4
7676
with:
7777
minimum-size: 32GB
7878
maximum-size: 32GB
@@ -88,7 +88,7 @@ jobs:
8888
Set-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps' -Name 'DumpType' -Type DWord -Value '2'
8989
9090
- name: Install .NET SDK v${{ env.DOTNET_VERSION }}
91-
uses: actions/setup-dotnet@v3
91+
uses: actions/setup-dotnet@v4
9292
with:
9393
dotnet-version: ${{ env.DOTNET_VERSION }}
9494

@@ -98,15 +98,14 @@ jobs:
9898

9999
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
100100
- name: Checkout Repository
101-
uses: actions/checkout@v3
101+
uses: actions/checkout@v4
102102
with:
103103
submodules: recursive
104104

105105
# Restore Tools from Manifest list in the Repository
106106
- name: Restore dotnet tools
107107
run: dotnet tool restore
108108

109-
# Pinning Manifest for 1.18 version of Uno.Check at the moment to unblock build, see https://github.com/CommunityToolkit/Windows/pull/320
110109
- name: Run Uno Check to Install Dependencies
111110
run: >
112111
dotnet tool run uno-check
@@ -117,10 +116,11 @@ jobs:
117116
--skip androidemulator
118117
--skip vswinworkloads
119118
--verbose
120-
--manifest https://raw.githubusercontent.com/unoplatform/uno.check/1660eba219684491362704c75153b40ce6ef7a35/manifests/uno.ui.manifest.json
121119
122120
- name: Add msbuild to PATH
123-
uses: microsoft/[email protected]
121+
uses: microsoft/setup-msbuild@v2
122+
with:
123+
vs-version: '[17.9,)'
124124

125125
- name: Enable ${{ env.TARGET_PLATFORMS }} TargetFrameworks
126126
working-directory: ./${{ env.MULTI_TARGET_DIRECTORY }}
@@ -158,6 +158,10 @@ jobs:
158158
working-directory: ./tooling/Scripts/
159159
run: ./PackEachExperiment.ps1 -date ${{ env.VERSION_DATE }}${{ env.VERSION_PROPERTY != '' && format(' -postfix {0}', env.VERSION_PROPERTY) || '' }}
160160

161+
- name: Validate package names
162+
if: ${{ env.VERSION_PROPERTY != '' }}
163+
run: powershell -version 5.1 -command "Get-ChildItem -Path '**/*.nupkg' | ForEach-Object { if (`$_.Name -notmatch '${{ env.VERSION_PROPERTY }}') { throw 'Nupkg name is missing trailing VERSION_PROPERTY' + `$_.Name } }" -ErrorAction Stop
164+
161165
# Push Pull Request Packages to our DevOps Artifacts Feed (see nuget.config)
162166
- name: Push PR packages (if not fork)
163167
if: ${{ env.IS_PR == 'true' && github.event.pull_request.head.repo.full_name == github.repository && github.actor != 'dependabot[bot]' }}
@@ -176,7 +180,7 @@ jobs:
176180
177181
# Run tests
178182
- name: Setup VSTest Path
179-
uses: darenm/Setup-VSTest@v1
183+
uses: darenm/setup-vstest@3a16d909a1f3bbc65b52f8270d475d905e7d3e44
180184

181185
- name: Install Testspace Module
182186
uses: testspace-com/setup-testspace@v1
@@ -193,14 +197,14 @@ jobs:
193197
if: ${{ always() && (steps.test-generator.conclusion == 'success' || steps.test-platform.conclusion == 'success') }}
194198

195199
- name: Artifact - Diagnostic Logs
196-
uses: actions/upload-artifact@v3
200+
uses: actions/upload-artifact@v4
197201
if: ${{ (env.ENABLE_DIAGNOSTICS == 'true' || env.COREHOST_TRACE != '') && always() }}
198202
with:
199203
name: build-logs
200204
path: ./**/*.*log
201205

202206
- name: Artifact - ILC Repro
203-
uses: actions/upload-artifact@v3
207+
uses: actions/upload-artifact@v4
204208
if: ${{ (env.ENABLE_DIAGNOSTICS == 'true' || env.COREHOST_TRACE != '') && always() }}
205209
with:
206210
name: ilc-repro
@@ -216,7 +220,7 @@ jobs:
216220
dump:
217221
- added: '${{ github.workspace }}/CrashDumps/*.dmp'
218222
- name: Artifact - WER crash dumps
219-
uses: actions/upload-artifact@v3
223+
uses: actions/upload-artifact@v4
220224
if: ${{ steps.filter.outputs.dump == 'true' && (env.ENABLE_DIAGNOSTICS == 'true' || env.COREHOST_TRACE != '') && always() }}
221225
with:
222226
name: CrashDumps-${{ matrix.platform }}
@@ -235,7 +239,7 @@ jobs:
235239

236240
steps:
237241
- name: Install .NET SDK v${{ env.DOTNET_VERSION }}
238-
uses: actions/setup-dotnet@v3
242+
uses: actions/setup-dotnet@v4
239243
with:
240244
dotnet-version: ${{ env.DOTNET_VERSION }}
241245

@@ -245,7 +249,7 @@ jobs:
245249

246250
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
247251
- name: Checkout Repository
248-
uses: actions/checkout@v3
252+
uses: actions/checkout@v4
249253
with:
250254
submodules: recursive
251255

@@ -270,7 +274,7 @@ jobs:
270274
# TODO: Do we want to run tests here? Can we do that on linux easily?
271275

272276
- name: Artifact - Diagnostic Logs
273-
uses: actions/upload-artifact@v3
277+
uses: actions/upload-artifact@v4
274278
if: ${{ (env.ENABLE_DIAGNOSTICS == 'true' || env.COREHOST_TRACE != '') && always() }}
275279
with:
276280
name: linux-logs

‎.vscode/extensions.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"recommendations": [
3-
"fernandoescolar.vscode-solution-explorer",
3+
"ms-dotnettools.csdevkit",
44
]
55
}

‎.vscode/settings.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
"omnisharp.defaultLaunchSolution": "CommunityToolkit.AllComponents.sln",
32
"omnisharp.disableMSBuildDiagnosticWarning": true,
43
"omnisharp.enableRoslynAnalyzers": true,
54
"omnisharp.useGlobalMono": "never",
@@ -8,5 +7,6 @@
87
"csharp.suppressDotnetRestoreNotification": true,
98
"csharp.semanticHighlighting.enabled": true,
109
"omnisharp.enableMsBuildLoadProjectsOnDemand": true,
11-
"dotnet.completion.showCompletionItemsFromUnimportedNamespaces": true
10+
"dotnet.completion.showCompletionItemsFromUnimportedNamespaces": true,
11+
"dotnet.defaultSolution": "CommunityToolkit.AllComponents.sln"
1212
}

‎components/.vsconfig‎

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

‎components/AppServices/src/CommunityToolkit.AppServices.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
1+
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
23
<PropertyGroup>
34
<ToolkitComponentName>AppServices</ToolkitComponentName>
45
<Description>This package contains AppServices, to easily communicate between UWP apps and Win32 extensions.</Description>

‎components/CanvasLayout/samples/CanvasLayout.Samples.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
1+
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
23
<PropertyGroup>
34
<ToolkitComponentName>CanvasLayout</ToolkitComponentName>
45
</PropertyGroup>

‎components/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
1+
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))')" />
23
<PropertyGroup>
34
<ToolkitComponentName>CanvasLayout</ToolkitComponentName>
45
<Description>This package contains a CanvasLayout Layout for ItemsRepeater.</Description>

0 commit comments

Comments
 (0)