Skip to content

Commit 985df6e

Browse files
andrueastmanandrueastman
authored
Merge pull request #1272 from microsoftgraph/dev
merge dev to main
2 parents 190fede + 5c78ba1 commit 985df6e

File tree

1,637 files changed

+86
-129775
lines changed

Some content is hidden

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

1,637 files changed

+86
-129775
lines changed

‎.azure-pipelines/generation-pipeline.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -696,6 +696,7 @@ stages:
696696
targetNamespace: "msgraph.generated"
697697
customArguments: "-b -e '/me' -e '/me/**'" # Enable backing store, Exclude me
698698
cleanMetadataFolder: $(cleanOpenAPIFolderV1)
699+
commitMessagePrefix: "feat(generation): update request builders and models"
699700
languageSpecificSteps:
700701
- template: generation-templates/python.yml
701702
parameters:
@@ -725,6 +726,7 @@ stages:
725726
targetNamespace: "msgraph_beta.generated"
726727
customArguments: "-b -e '/me' -e '/me/**'" # Enable backing store, Exclude me
727728
cleanMetadataFolder: $(cleanOpenAPIFolderBeta)
729+
commitMessagePrefix: "feat(generation): update request builders and models"
728730
languageSpecificSteps:
729731
- template: generation-templates/python.yml
730732
parameters:

‎.github/workflows/dotnet.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,3 @@ jobs:
3737
with:
3838
name: unit-test-output
3939
path: test/Typewriter.Test/bin/Debug/net8.0/output/
40-
- name: Upload unit test java output on failure
41-
uses: actions/upload-artifact@v4
42-
if: ${{ failure() }}
43-
with:
44-
name: unit-test-output-java
45-
path: test/Typewriter.Test/bin/Debug/net8.0/outputJava/

‎.vscode/launch.json‎

Lines changed: 0 additions & 340 deletions
Original file line numberDiff line numberDiff line change
@@ -1,178 +1,6 @@
11
{
22
"version": "0.2.0",
33
"configurations": [
4-
{
5-
"name": "Generate CSharp beta",
6-
"type": "coreclr",
7-
"request": "launch",
8-
"preLaunchTask": "build",
9-
"program": "${workspaceFolder}/src/Typewriter/bin/Debug/net8.0/Typewriter.dll",
10-
"args": [
11-
"-v",
12-
"Info",
13-
"-m",
14-
"${workspaceFolder}/../msgraph-metadata/clean_beta_metadata/cleanMetadataWithDescriptionsbeta.xml",
15-
"-g",
16-
"Files",
17-
"-l",
18-
"CSharp",
19-
"-o",
20-
"${workspaceFolder}/../generator-output-CSharp-beta",
21-
"-e",
22-
"beta"
23-
],
24-
"cwd": "${workspaceFolder}/src/Typewriter/bin/Debug/net8.0",
25-
"console": "internalConsole",
26-
"stopAtEntry": false
27-
},
28-
{
29-
"name": "Generate CSharp v1.0",
30-
"type": "coreclr",
31-
"request": "launch",
32-
"preLaunchTask": "build",
33-
"program": "${workspaceFolder}/src/Typewriter/bin/Debug/net8.0/Typewriter.dll",
34-
"args": [
35-
"-v",
36-
"Info",
37-
"-m",
38-
"${workspaceFolder}/../msgraph-metadata/clean_v10_metadata/cleanMetadataWithDescriptionsv1.0.xml",
39-
"-g",
40-
"Files",
41-
"-l",
42-
"CSharp",
43-
"-o",
44-
"${workspaceFolder}/../generator-output-CSharp-v1.0",
45-
"-e",
46-
"v1.0"
47-
],
48-
"cwd": "${workspaceFolder}/src/Typewriter/bin/Debug/net8.0",
49-
"console": "internalConsole",
50-
"stopAtEntry": false
51-
},
52-
{
53-
"name": "Update Test Data CSharp v1.0",
54-
"type": "coreclr",
55-
"request": "launch",
56-
"preLaunchTask": "build",
57-
"program": "${workspaceFolder}/src/Typewriter/bin/Debug/net8.0/Typewriter.dll",
58-
"args": [
59-
"-v",
60-
"Info",
61-
"-m",
62-
"${workspaceFolder}/test/Typewriter.Test/Metadata/MetadataMultipleNamespaces.xml",
63-
"-g",
64-
"Files",
65-
"-l",
66-
"CSharp",
67-
"-o",
68-
"${workspaceFolder}/test/Typewriter.Test/TestDataCSharp",
69-
"-e",
70-
"v1.0"
71-
],
72-
"cwd": "${workspaceFolder}/src/Typewriter/bin/Debug/net8.0",
73-
"console": "internalConsole",
74-
"stopAtEntry": false
75-
},
76-
{
77-
"name": "Generate PHP beta",
78-
"type": "coreclr",
79-
"request": "launch",
80-
"preLaunchTask": "build",
81-
"program": "${workspaceFolder}/src/Typewriter/bin/Debug/net8.0/Typewriter.dll",
82-
"args": [
83-
"-v",
84-
"Info",
85-
"-m",
86-
"${workspaceFolder}/../msgraph-metadata/clean_beta_metadata/cleanMetadataWithDescriptionsbeta.xml",
87-
"-g",
88-
"Files",
89-
"-l",
90-
"PHP",
91-
"-o",
92-
"${workspaceFolder}/../generator-output-PHP-beta",
93-
"-e",
94-
"beta",
95-
"-p",
96-
"php.namespacePrefix:Beta"
97-
],
98-
"cwd": "${workspaceFolder}/src/Typewriter/bin/Debug/net8.0",
99-
"console": "internalConsole",
100-
"stopAtEntry": false
101-
},
102-
{
103-
"name": "Update Test Data PHP beta",
104-
"type": "coreclr",
105-
"request": "launch",
106-
"preLaunchTask": "build",
107-
"program": "${workspaceFolder}/src/Typewriter/bin/Debug/net8.0/Typewriter.dll",
108-
"args": [
109-
"-v",
110-
"Info",
111-
"-m",
112-
"${workspaceFolder}/test/Typewriter.Test/Metadata/MetadataWithSubNamespaces.xml",
113-
"-g",
114-
"Files",
115-
"-l",
116-
"PHP",
117-
"-o",
118-
"${workspaceFolder}/test/Typewriter.Test/TestDataPHPBeta",
119-
"-e",
120-
"beta",
121-
"-p",
122-
"php.namespacePrefix:Beta"
123-
],
124-
"cwd": "${workspaceFolder}/src/Typewriter/bin/Debug/net8.0",
125-
"console": "internalConsole",
126-
"stopAtEntry": false
127-
},
128-
{
129-
"name": "Generate PHP v1.0",
130-
"type": "coreclr",
131-
"request": "launch",
132-
"preLaunchTask": "build",
133-
"program": "${workspaceFolder}/src/Typewriter/bin/Debug/net8.0/Typewriter.dll",
134-
"args": [
135-
"-v",
136-
"Info",
137-
"-m",
138-
"${workspaceFolder}/../msgraph-metadata/clean_v10_metadata/cleanMetadataWithDescriptionsv1.0.xml",
139-
"-g",
140-
"Files",
141-
"-l",
142-
"PHP",
143-
"-o",
144-
"${workspaceFolder}/../generator-output-PHP-v1.0",
145-
"-e",
146-
"v1.0"
147-
],
148-
"cwd": "${workspaceFolder}/src/Typewriter/bin/Debug/net8.0",
149-
"console": "internalConsole",
150-
"stopAtEntry": false
151-
},
152-
{
153-
"name": "Update Test Data PHP v1.0",
154-
"type": "coreclr",
155-
"request": "launch",
156-
"preLaunchTask": "build",
157-
"program": "${workspaceFolder}/src/Typewriter/bin/Debug/net8.0/Typewriter.dll",
158-
"args": [
159-
"-v",
160-
"Info",
161-
"-m",
162-
"${workspaceFolder}/test/Typewriter.Test/Metadata/MetadataWithSubNamespaces.xml",
163-
"-g",
164-
"Files",
165-
"-l",
166-
"PHP",
167-
"-o",
168-
"${workspaceFolder}/test/Typewriter.Test/TestDataPHP",
169-
"-e",
170-
"v1.0"
171-
],
172-
"cwd": "${workspaceFolder}/src/Typewriter/bin/Debug/net8.0",
173-
"console": "internalConsole",
174-
"stopAtEntry": false
175-
},
1764
{
1775
"name": "Generate TypeScript beta",
1786
"type": "coreclr",
@@ -273,174 +101,6 @@
273101
"console": "internalConsole",
274102
"stopAtEntry": false
275103
},
276-
{
277-
"name": "Generate Java beta",
278-
"type": "coreclr",
279-
"request": "launch",
280-
"preLaunchTask": "build",
281-
"program": "${workspaceFolder}/src/Typewriter/bin/Debug/net8.0/Typewriter.dll",
282-
"args": [
283-
"-v",
284-
"Info",
285-
"-m",
286-
"${workspaceFolder}/../msgraph-metadata/clean_beta_metadata/cleanMetadataWithDescriptionsbeta.xml",
287-
"-g",
288-
"Files",
289-
"-l",
290-
"Java",
291-
"-o",
292-
"${workspaceFolder}/../generator-output-Java-beta",
293-
"-e",
294-
"beta"
295-
],
296-
"cwd": "${workspaceFolder}/src/Typewriter/bin/Debug/net8.0",
297-
"console": "internalConsole",
298-
"stopAtEntry": false
299-
},
300-
{
301-
"name": "Update Test Data Java beta",
302-
"type": "coreclr",
303-
"request": "launch",
304-
"preLaunchTask": "build",
305-
"program": "${workspaceFolder}/src/Typewriter/bin/Debug/net8.0/Typewriter.dll",
306-
"args": [
307-
"-v",
308-
"Info",
309-
"-m",
310-
"${workspaceFolder}/test/Typewriter.Test/Metadata/MetadataMultipleNamespaces.xml",
311-
"-g",
312-
"Files",
313-
"-l",
314-
"Java",
315-
"-o",
316-
"${workspaceFolder}/test/Typewriter.Test/TestDataJavaBeta",
317-
"-e",
318-
"beta"
319-
],
320-
"cwd": "${workspaceFolder}/src/Typewriter/bin/Debug/net8.0",
321-
"console": "internalConsole",
322-
"stopAtEntry": false
323-
},
324-
{
325-
"name": "Generate Java v1.0",
326-
"type": "coreclr",
327-
"request": "launch",
328-
"preLaunchTask": "build",
329-
"program": "${workspaceFolder}/src/Typewriter/bin/Debug/net8.0/Typewriter.dll",
330-
"args": [
331-
"-v",
332-
"Info",
333-
"-m",
334-
"${workspaceFolder}/../msgraph-metadata/clean_v10_metadata/cleanMetadataWithDescriptionsv1.0.xml",
335-
"-g",
336-
"Files",
337-
"-l",
338-
"Java",
339-
"-o",
340-
"${workspaceFolder}/../generator-output-Java-v1.0",
341-
"-e",
342-
"v1.0"
343-
],
344-
"cwd": "${workspaceFolder}/src/Typewriter/bin/Debug/net8.0",
345-
"console": "internalConsole",
346-
"stopAtEntry": false
347-
},
348-
{
349-
"name": "Update Test Data Java v1.0",
350-
"type": "coreclr",
351-
"request": "launch",
352-
"preLaunchTask": "build",
353-
"program": "${workspaceFolder}/src/Typewriter/bin/Debug/net8.0/Typewriter.dll",
354-
"args": [
355-
"-v",
356-
"Info",
357-
"-m",
358-
"${workspaceFolder}/test/Typewriter.Test/Metadata/MetadataMultipleNamespaces.xml",
359-
"-g",
360-
"Files",
361-
"-l",
362-
"Java",
363-
"-o",
364-
"${workspaceFolder}/test/Typewriter.Test/TestDataJava",
365-
"-e",
366-
"v1.0"
367-
],
368-
"cwd": "${workspaceFolder}/src/Typewriter/bin/Debug/net8.0",
369-
"console": "internalConsole",
370-
"stopAtEntry": false
371-
},
372-
{
373-
"name": "Generate ObjC beta",
374-
"type": "coreclr",
375-
"request": "launch",
376-
"preLaunchTask": "build",
377-
"program": "${workspaceFolder}/src/Typewriter/bin/Debug/net8.0/Typewriter.dll",
378-
"args": [
379-
"-v",
380-
"Info",
381-
"-m",
382-
"${workspaceFolder}/../msgraph-metadata/clean_beta_metadata/cleanMetadataWithDescriptionsbeta.xml",
383-
"-g",
384-
"Files",
385-
"-l",
386-
"ObjC",
387-
"-o",
388-
"${workspaceFolder}/../generator-output-ObjC-beta",
389-
"-e",
390-
"beta"
391-
],
392-
"cwd": "${workspaceFolder}/src/Typewriter/bin/Debug/net8.0",
393-
"console": "internalConsole",
394-
"stopAtEntry": false
395-
},
396-
{
397-
"name": "Generate ObjC v1.0",
398-
"type": "coreclr",
399-
"request": "launch",
400-
"preLaunchTask": "build",
401-
"program": "${workspaceFolder}/src/Typewriter/bin/Debug/net8.0/Typewriter.dll",
402-
"args": [
403-
"-v",
404-
"Info",
405-
"-m",
406-
"${workspaceFolder}/../msgraph-metadata/clean_v10_metadata/cleanMetadataWithDescriptionsv1.0.xml",
407-
"-g",
408-
"Files",
409-
"-l",
410-
"ObjC",
411-
"-o",
412-
"${workspaceFolder}/../generator-output-ObjC-v1.0",
413-
"-e",
414-
"v1.0"
415-
],
416-
"cwd": "${workspaceFolder}/src/Typewriter/bin/Debug/net8.0",
417-
"console": "internalConsole",
418-
"stopAtEntry": false
419-
},
420-
{
421-
"name": "Update Test Data ObjC v1.0",
422-
"type": "coreclr",
423-
"request": "launch",
424-
"preLaunchTask": "build",
425-
"program": "${workspaceFolder}/src/Typewriter/bin/Debug/net8.0/Typewriter.dll",
426-
"args": [
427-
"-v",
428-
"Info",
429-
"-m",
430-
"${workspaceFolder}/test/Typewriter.Test/Metadata/MetadataWithSubNamespaces.xml",
431-
"-g",
432-
"Files",
433-
"-l",
434-
"ObjC",
435-
"-o",
436-
"${workspaceFolder}/test/Typewriter.Test/TestDataObjC",
437-
"-e",
438-
"v1.0"
439-
],
440-
"cwd": "${workspaceFolder}/src/Typewriter/bin/Debug/net8.0",
441-
"console": "internalConsole",
442-
"stopAtEntry": false
443-
},
444104
{
445105
"name": "v1.0 - transform - keep capability annotations",
446106
"type": "coreclr",

‎Generate.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Invoke-WebRequest $metadata -outfile metadata.xml
1212
apidoc publish-edmx --path 'docs\api-reference\v1.0' --source metadata.xml --output finalmetadata --skip-generation
1313

1414
# Generate new Types from metadata
15-
typewriter -v Info -l CSharp -m 'finalmetadata/metadata.xml' -o generated
15+
typewriter -v Info -l TypeScript -m 'finalmetadata/metadata.xml' -o generated
1616

1717
# Based on Language pull repo
1818
git clone --depth 1 https://github.com/microsoftgraph/msgraph-sdk-dotnet.git source

‎GraphODataTemplateWriter.Test/GraphODataTemplateWriter.Test.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<ItemGroup>
1919
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
2020
<PackageReference Include="MSTest.TestAdapter">
21-
<Version>3.5.0</Version>
21+
<Version>3.5.2</Version>
2222
</PackageReference>
2323
<PackageReference Include="MSTest.TestFramework">
2424
<Version>3.5.1</Version>

0 commit comments

Comments
 (0)