Skip to content

Commit

Permalink
[build]: Update PCF Tools packages to v0.3.0 (#24)
Browse files Browse the repository at this point in the history
* [build]: Update PCF Tools packages to v0.3.0

* dotnet msbuild -t:UpdatePcfPackagesVersion -p:NewVersion=1.32.5

* npm i -D typescript@latest

* npm audit fix

* npm i -D @microsoft/eslint-plugin-power-apps @types/jest @types/node@20 @types/powerapps-component-framework @types/xrm @typescript-eslint/eslint-plugin @typescript-eslint/parser ts-jest

* docs: Replace .NET 6 with .NET 8

---------

Co-authored-by: [pcf-tools] <[email protected]>
  • Loading branch information
cathalnoonan and [pcf-tools] authored May 26, 2024
1 parent db16fc7 commit a9c4ff6
Show file tree
Hide file tree
Showing 11 changed files with 343 additions and 379 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"image": "mcr.microsoft.com/devcontainers/javascript-node:20-bookworm",
"features": {
"ghcr.io/devcontainers/features/dotnet:2": {
"version": "6.0"
"version": "8.0"
}
},
"customizations": {
Expand Down
1 change: 1 addition & 0 deletions .github/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ changelog:
exclude:
labels:
- dependencies
- no-release-note
- title: Dependencies
labels:
- dependencies
6 changes: 4 additions & 2 deletions .github/workflows/BUILD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,15 @@ jobs:
cache-dependency-path: control/package-lock.json
- name: "Setup: dotnet"
uses: actions/setup-dotnet@v4
- name: "Build: dotnet restore"
run: dotnet restore
- name: "Build: dotnet build"
run: dotnet build
run: dotnet build --no-restore
- name: "Build: dotnet test"
run: dotnet test --no-build
- name: "Artifacts: Create file containing URL of repo"
run: echo "${{ github.server_url }}/${{ github.repository }}" > ./dist/repo-url.txt
- name: "Release: Upload artifact"
- name: "Artifacts: Upload artifact"
uses: actions/upload-artifact@v4
with:
name: ${{ github.event.repository.name }}__extract_this_zip
Expand Down
22 changes: 22 additions & 0 deletions .github/workflows/devcontainer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: devcontainer

on:
push:
branches:
- "**"
paths:
- ".devcontainer/**"
- ".github/workflows/devcontainer.yml"
- "compose.yml"

jobs:
devcontainer:
runs-on: ubuntu-latest
steps:
- name: "Setup: Checkout"
uses: actions/checkout@v4
- name: "Test: Build and run dev container"
uses: devcontainers/[email protected]
with:
runCmd: dotnet build
push: never
4 changes: 2 additions & 2 deletions control/control.pcfproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Sdk Name="Cathal.PcfTools.MSBuild.Control" Version="0.2.2" />
<Sdk Name="Cathal.PcfTools.MSBuild.Control" Version="0.3.0" />
<PropertyGroup>
<PowerAppsTargetsPath>$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\PowerApps</PowerAppsTargetsPath>
</PropertyGroup>
Expand All @@ -18,7 +18,7 @@
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.PowerApps.MSBuild.Pcf" Version="1.27.5" />
<PackageReference Include="Microsoft.PowerApps.MSBuild.Pcf" Version="1.32.5" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
Expand Down
647 changes: 293 additions & 354 deletions control/package-lock.json

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions control/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,21 @@
"react-dom": "16.14.0"
},
"devDependencies": {
"@microsoft/eslint-plugin-power-apps": "^0.2.11",
"@types/jest": "^29.5.11",
"@types/node": "^20.6.3",
"@types/powerapps-component-framework": "^1.3.5",
"@microsoft/eslint-plugin-power-apps": "^0.2.33",
"@types/jest": "^29.5.12",
"@types/node": "^20.12.12",
"@types/powerapps-component-framework": "^1.3.14",
"@types/react": "16.14.5",
"@types/react-dom": "^16.9.19",
"@types/xrm": "^9.0.74",
"@typescript-eslint/eslint-plugin": "^6.7.2",
"@typescript-eslint/parser": "^6.7.2",
"@types/xrm": "^9.0.80",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"pcf-scripts": "^1.27.5",
"pcf-start": "^1.27.5",
"ts-jest": "^29.1.1",
"typescript": "^4.4.4"
"pcf-scripts": "^1.32.5",
"pcf-start": "^1.32.5",
"ts-jest": "^29.1.3",
"typescript": "^5.4.5"
},
"license": "MIT",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion d365-pcf-securityrolemanager.proj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Sdk Name="Cathal.PcfTools.MSBuild.Proj" Version="0.2.2" />
<Sdk Name="Cathal.PcfTools.MSBuild.Proj" Version="0.3.0" />
</Project>
10 changes: 5 additions & 5 deletions docs/development.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ There are two approaches to developing for this project:

## Local Machine Development Prerequisites

### .NET 6
Check if .NET 6 is installed by running the command:
### .NET 8
Check if .NET 8 is installed by running the command:
```sh
dotnet --list-sdks
```
- If a version starting with `6.0` is listed, then dotnet 6 is installed.
- If a version starting with `8.0` is listed, then dotnet 8 is installed.
- Download from the Microsoft website here:
https://dotnet.microsoft.com/en-us/download/dotnet/6.0
https://dotnet.microsoft.com/en-us/download/dotnet/8.0

### Node JS
Rather than installing Node JS directly, using a node version manager is recommended. This will make it easier to switch between node versions for different projects.
Expand All @@ -33,7 +33,7 @@ node --version

## Dev Container Development Prerequisites

The [devcontainer.json](../.devcontainer/devcontainer.json) file includes to NodeJS and .NET.
The [devcontainer.json](../.devcontainer/devcontainer.json) file includes NodeJS and .NET.

- Docker
- [Visual Studio Code](https://code.visualstudio.com/download)
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"rollForward": "latestFeature",
"version": "6.0.0"
"version": "8.0.0"
}
}
4 changes: 2 additions & 2 deletions solution/solution.cdsproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Sdk Name="Cathal.PcfTools.MSBuild.Solution" Version="0.2.2" />
<Sdk Name="Cathal.PcfTools.MSBuild.Solution" Version="0.3.0" />
<PropertyGroup>
<PowerAppsTargetsPath>$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\PowerApps</PowerAppsTargetsPath>
</PropertyGroup>
Expand All @@ -18,7 +18,7 @@
<SolutionPackageMapFilePath>$(MSBuildThisFileDirectory)\src\map.xml</SolutionPackageMapFilePath>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.PowerApps.MSBuild.Solution" Version="1.27.5" />
<PackageReference Include="Microsoft.PowerApps.MSBuild.Solution" Version="1.32.5" />
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.2" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
Expand Down

0 comments on commit a9c4ff6

Please sign in to comment.