Skip to content

Commit fef0a36

Browse files
NETWORKWISENETWORKWISE
authored
Merge branch 'KelvinTegelaar:master' into master
2 parents 5cca577 + 7c7cabd commit fef0a36

978 files changed

Lines changed: 31486 additions & 3931 deletions

File tree

Some content is hidden

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

‎.DS_Store‎

10 KB
Binary file not shown.

‎.github/workflows/publish_release.yml‎

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,36 @@ jobs:
4848
echo "tag_exists=false" >> $GITHUB_ENV
4949
fi
5050
51+
# Get Previous Tag
52+
- name: Get Previous Tag
53+
id: previous_tag
54+
if: env.tag_exists == 'false'
55+
run: |
56+
PREV_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "")
57+
echo "previous_tag=$PREV_TAG" >> $GITHUB_OUTPUT
58+
echo "Previous tag: $PREV_TAG"
59+
5160
# Generate Release Notes
5261
- name: Generate Release Notes
5362
id: changelog
5463
if: env.tag_exists == 'false'
55-
uses: mikepenz/release-changelog-builder-action@v5.0.0
64+
uses: actions/github-script@v7
65+
with:
66+
script: |
67+
const params = {
68+
owner: context.repo.owner,
69+
repo: context.repo.repo,
70+
tag_name: '${{ steps.get_version.outputs.version }}',
71+
target_commitish: context.sha
72+
};
73+
74+
const previousTag = '${{ steps.previous_tag.outputs.previous_tag }}';
75+
if (previousTag) {
76+
params.previous_tag_name = previousTag;
77+
}
78+
79+
const { data } = await github.rest.repos.generateReleaseNotes(params);
80+
core.setOutput('changelog', data.body);
5681
env:
5782
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5883

@@ -75,10 +100,6 @@ jobs:
75100
if: env.tag_exists == 'false'
76101
run: |
77102
mkdir -p src/releases
78-
zip -r src/releases/release_${{ steps.get_version.outputs.version }}.zip . \
79-
--exclude "./src/releases/*" \
80-
--exclude ".*" \
81-
--exclude ".*/**"
82103
zip -r src/releases/latest.zip . \
83104
--exclude "./src/releases/*" \
84105
--exclude ".*" \

‎.gitignore‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@ ExcludedTenants
1010
SendNotifications/config.json
1111
.env
1212
Output/
13+
node_modules/.yarn-integrity
14+
yarn.lock
1315

1416
# Cursor IDE
1517
.cursor/rules
18+
19+
# Ignore all root PowerShell files except profile.ps1
20+
/*.ps1
21+
!/profile.ps1

‎CIPP-Permissions.json‎

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

‎CIPPTimers.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,5 +222,23 @@
222222
"Priority": 21,
223223
"RunOnProcessor": true,
224224
"IsSystem": true
225+
},
226+
{
227+
"Id": "9a7f8e6d-5c4b-3a2d-1e0f-9b8c7d6e5f4a",
228+
"Command": "Start-CIPPDBCacheOrchestrator",
229+
"Description": "Timer to collect and cache Microsoft Graph data for all tenants",
230+
"Cron": "0 0 3 * * *",
231+
"Priority": 22,
232+
"RunOnProcessor": true,
233+
"IsSystem": true
234+
},
235+
{
236+
"Id": "1f2e3d4c-5b6a-7c8d-9e0f-1a2b3c4d5e6f",
237+
"Command": "Start-TestsOrchestrator",
238+
"Description": "Timer to run security and compliance tests against cached data",
239+
"Cron": "0 0 4 * * *",
240+
"Priority": 23,
241+
"RunOnProcessor": true,
242+
"IsSystem": true
225243
}
226244
]

‎Config/ExcludeSkuList.JSON‎

Lines changed: 34 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -3,53 +3,17 @@
33
"GUID": "90d8b3f8-712e-4f7b-aa1e-62e7ae6cbe96",
44
"Product_Display_Name": "Business Apps (free)"
55
},
6-
{
7-
"GUID": "90d8b3f8-712e-4f7b-aa1e-62e7ae6cbe96",
8-
"Product_Display_Name": "Business Apps (free)"
9-
},
10-
{
11-
"GUID": "f30db892-07e9-47e9-837c-80727f46fd3d",
12-
"Product_Display_Name": "MICROSOFT FLOW FREE"
13-
},
146
{
157
"GUID": "f30db892-07e9-47e9-837c-80727f46fd3d",
16-
"Product_Display_Name": "MICROSOFT FLOW FREE"
17-
},
18-
{
19-
"GUID": "f30db892-07e9-47e9-837c-80727f46fd3d",
20-
"Product_Display_Name": "MICROSOFT FLOW FREE"
21-
},
22-
{
23-
"GUID": "16ddbbfc-09ea-4de2-b1d7-312db6112d70",
24-
"Product_Display_Name": "MICROSOFT TEAMS (FREE)"
8+
"Product_Display_Name": "Microsoft Power Automate Free"
259
},
2610
{
2711
"GUID": "16ddbbfc-09ea-4de2-b1d7-312db6112d70",
28-
"Product_Display_Name": "MICROSOFT TEAMS (FREE)"
29-
},
30-
{
31-
"GUID": "16ddbbfc-09ea-4de2-b1d7-312db6112d70",
32-
"Product_Display_Name": "MICROSOFT TEAMS (FREE)"
33-
},
34-
{
35-
"GUID": "16ddbbfc-09ea-4de2-b1d7-312db6112d70",
36-
"Product_Display_Name": "MICROSOFT TEAMS (FREE)"
37-
},
38-
{
39-
"GUID": "16ddbbfc-09ea-4de2-b1d7-312db6112d70",
40-
"Product_Display_Name": "MICROSOFT TEAMS (FREE)"
41-
},
42-
{
43-
"GUID": "16ddbbfc-09ea-4de2-b1d7-312db6112d70",
44-
"Product_Display_Name": "MICROSOFT TEAMS (FREE)"
12+
"Product_Display_Name": "Microsoft Teams (Free)"
4513
},
4614
{
4715
"GUID": "a403ebcc-fae0-4ca2-8c8c-7a907fd6c235",
48-
"Product_Display_Name": "Power BI (free)"
49-
},
50-
{
51-
"GUID": "a403ebcc-fae0-4ca2-8c8c-7a907fd6c235",
52-
"Product_Display_Name": "Power BI (free)"
16+
"Product_Display_Name": "Microsoft Fabric (Free)"
5317
},
5418
{
5519
"GUID": "61e6bd70-fbdb-4deb-82ea-912842f39431",
@@ -59,33 +23,9 @@
5923
"GUID": "bc946dac-7877-4271-b2f7-99d2db13cd2c",
6024
"Product_Display_Name": "Dynamics 365 Customer Voice Trial"
6125
},
62-
{
63-
"GUID": "bc946dac-7877-4271-b2f7-99d2db13cd2c",
64-
"Product_Display_Name": "Dynamics 365 Customer Voice Trial"
65-
},
66-
{
67-
"GUID": "bc946dac-7877-4271-b2f7-99d2db13cd2c",
68-
"Product_Display_Name": "Dynamics 365 Customer Voice Trial"
69-
},
70-
{
71-
"GUID": "bc946dac-7877-4271-b2f7-99d2db13cd2c",
72-
"Product_Display_Name": "Dynamics 365 Customer Voice Trial"
73-
},
74-
{
75-
"GUID": "bc946dac-7877-4271-b2f7-99d2db13cd2c",
76-
"Product_Display_Name": "Dynamics 365 Customer Voice Trial"
77-
},
78-
{
79-
"GUID": "338148b6-1b11-4102-afb9-f92b6cdc0f8d",
80-
"Product_Display_Name": "DYNAMICS 365 P1 TRIAL FOR INFORMATION WORKERS"
81-
},
8226
{
8327
"GUID": "338148b6-1b11-4102-afb9-f92b6cdc0f8d",
84-
"Product_Display_Name": "DYNAMICS 365 P1 TRIAL FOR INFORMATION WORKERS"
85-
},
86-
{
87-
"GUID": "fcecd1f9-a91e-488d-a918-a96cdb6ce2b0",
88-
"Product_Display_Name": "Microsoft Dynamics AX7 User Trial"
28+
"Product_Display_Name": "Dynamics 365 P1 Tria for Information Workers"
8929
},
9030
{
9131
"GUID": "fcecd1f9-a91e-488d-a918-a96cdb6ce2b0",
@@ -95,92 +35,68 @@
9535
"GUID": "dcb1a3ae-b33f-4487-846a-a640262fadf4",
9636
"Product_Display_Name": "Microsoft Power Apps Plan 2 Trial"
9737
},
98-
{
99-
"GUID": "dcb1a3ae-b33f-4487-846a-a640262fadf4",
100-
"Product_Display_Name": "Microsoft Power Apps Plan 2 Trial"
101-
},
102-
{
103-
"GUID": "dcb1a3ae-b33f-4487-846a-a640262fadf4",
104-
"Product_Display_Name": "Microsoft Power Apps Plan 2 Trial"
105-
},
106-
{
107-
"GUID": "dcb1a3ae-b33f-4487-846a-a640262fadf4",
108-
"Product_Display_Name": "Microsoft Power Apps Plan 2 Trial"
109-
},
110-
{
111-
"GUID": "dcb1a3ae-b33f-4487-846a-a640262fadf4",
112-
"Product_Display_Name": "Microsoft Power Apps Plan 2 Trial"
113-
},
114-
{
115-
"GUID": "74fbf1bb-47c6-4796-9623-77dc7371723b",
116-
"Product_Display_Name": "Microsoft Teams Trial"
117-
},
118-
{
119-
"GUID": "74fbf1bb-47c6-4796-9623-77dc7371723b",
120-
"Product_Display_Name": "Microsoft Teams Trial"
121-
},
12238
{
12339
"GUID": "74fbf1bb-47c6-4796-9623-77dc7371723b",
12440
"Product_Display_Name": "Microsoft Teams Trial"
12541
},
12642
{
127-
"GUID": "74fbf1bb-47c6-4796-9623-77dc7371723b",
128-
"Product_Display_Name": "Microsoft Teams Trial"
43+
"GUID": "606b54a9-78d8-4298-ad8b-df6ef4481c80",
44+
"Product_Display_Name": "Microsoft Copilot Studio Viral Trial"
12945
},
13046
{
131-
"GUID": "74fbf1bb-47c6-4796-9623-77dc7371723b",
132-
"Product_Display_Name": "Microsoft Teams Trial"
47+
"GUID": "1f2f344a-700d-42c9-9427-5cea1d5d7ba6",
48+
"Product_Display_Name": "Microsoft Stream"
13349
},
13450
{
135-
"GUID": "74fbf1bb-47c6-4796-9623-77dc7371723b",
136-
"Product_Display_Name": "Microsoft Teams Trial"
51+
"GUID": "6470687e-a428-4b7a-bef2-8a291ad947c9",
52+
"Product_Display_Name": "Windows Store for Business"
13753
},
13854
{
139-
"GUID": "74fbf1bb-47c6-4796-9623-77dc7371723b",
140-
"Product_Display_Name": "Microsoft Teams Trial"
55+
"GUID": "710779e8-3d4a-4c88-adb9-386c958d1fdf",
56+
"Product_Display_Name": "Microsoft Teams Exploratory"
14157
},
14258
{
143-
"GUID": "74fbf1bb-47c6-4796-9623-77dc7371723b",
144-
"Product_Display_Name": "Microsoft Teams Trial"
59+
"GUID": "8c4ce438-32a7-4ac5-91a6-e22ae08d9c8b",
60+
"Product_Display_Name": "Rights Management Adhoc"
14561
},
14662
{
147-
"GUID": "74fbf1bb-47c6-4796-9623-77dc7371723b",
148-
"Product_Display_Name": "Microsoft Teams Trial"
63+
"GUID": "5b631642-bd26-49fe-bd20-1daaa972ef80",
64+
"Product_Display_Name": "Microsoft Power Apps for Developer"
14965
},
15066
{
151-
"GUID": "74fbf1bb-47c6-4796-9623-77dc7371723b",
152-
"Product_Display_Name": "Microsoft Teams Trial"
67+
"GUID": "6a4a1628-9b9a-424d-bed5-4118f0ede3fd",
68+
"Product_Display_Name": "Dynamics 365 Business Central for IWs"
15369
},
15470
{
155-
"GUID": "606b54a9-78d8-4298-ad8b-df6ef4481c80",
156-
"Product_Display_Name": "Power Virtual Agents Viral Trial"
71+
"GUID": "6ec92958-3cc1-49db-95bd-bc6b3798df71",
72+
"Product_Display_Name": "Dynamics 365 Sales Premium Viral Trial"
15773
},
15874
{
159-
"GUID": "606b54a9-78d8-4298-ad8b-df6ef4481c80",
160-
"Product_Display_Name": "Power Virtual Agents Viral Trial"
75+
"GUID": "3f9f06f5-3c31-472c-985f-62d9c10ec167",
76+
"Product_Display_Name": "Power Pages vTrial for Makers"
16177
},
16278
{
163-
"GUID": "606b54a9-78d8-4298-ad8b-df6ef4481c80",
164-
"Product_Display_Name": "Power Virtual Agents Viral Trial"
79+
"GUID": "9c7bff7a-3715-4da7-88d3-07f57f8d0fb6",
80+
"Product_Display_Name": "Dynamics 365 For Sales Professional Trial"
16581
},
16682
{
167-
"GUID": "1f2f344a-700d-42c9-9427-5cea1d5d7ba6",
168-
"Product_Display_Name": "MICROSOFT STREAM"
83+
"GUID": "8f0c5670-4e56-4892-b06d-91c085d7004f",
84+
"Product_Display_Name": "App Connect IW"
16985
},
17086
{
171-
"GUID": "1f2f344a-700d-42c9-9427-5cea1d5d7ba6",
172-
"Product_Display_Name": "MICROSOFT STREAM"
87+
"GUID": "87bbbc60-4754-4998-8c88-227dca264858",
88+
"Product_Display_Name": "Power Apps and Logic Flows"
17389
},
17490
{
175-
"GUID": "6470687e-a428-4b7a-bef2-8a291ad947c9",
176-
"Product_Display_Name": "WINDOWS STORE FOR BUSINESS"
91+
"GUID": "e5788282-6381-469f-84f0-3d7d4021d34d",
92+
"Product_Display_Name": "Office 365 Extra File Storage for GCC"
17793
},
17894
{
179-
"GUID": "6470687e-a428-4b7a-bef2-8a291ad947c9",
180-
"Product_Display_Name": "WINDOWS STORE FOR BUSINESS"
95+
"GUID": "99049c9c-6011-4908-bf17-15f496e6519d",
96+
"Product_Display_Name": "Office 365 Extra File Storage"
18197
},
18298
{
183-
"GUID": "710779e8-3d4a-4c88-adb9-386c958d1fdf",
184-
"Product_Display_Name": "MICROSOFT TEAMS EXPLORATORY"
99+
"GUID": "47794cd0-f0e5-45c5-9033-2eb6b5fc84e0",
100+
"Product_Display_Name": "Communications Credits"
185101
}
186102
]

0 commit comments

Comments
 (0)