Skip to content

Commit 6873ac3

Browse files
Updating the versioning for the preview
1 parent 2f5281d commit 6873ac3

23 files changed

Lines changed: 4531 additions & 541 deletions

File tree

RELATIONSHIP_MEMBERS_PROPOSAL.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Implement enhanced relationship member types that provide rich object metadata w
5656

5757
### Version Strategy
5858

59-
- **Enhanced Versions**: `beta/1.0.1-preview` and `v1.0/1.0.1-preview`
59+
- **Enhanced Versions**: `beta/1.1.0-preview` and `v1.0/1.1.0-preview`
6060
- **Legacy Versions**: `v1.0/1.0.0` (maintains string arrays)
6161
- **Detection Logic**: `isEnhancedRelationshipVersion()` function
6262

@@ -95,16 +95,16 @@ if (isEnhanced) {
9595
**Location:** `src/generator/src/generate.ts`
9696

9797
**Changes:**
98-
- Updated `extensionConfigForGeneration` with v1.0.1 configuration
99-
- Enhanced `shouldIncludeFilePath` with v1.0.1 patterns
100-
- Updated `buildTypeIndex` for v1.0.1 version handling
98+
- Updated `extensionConfigForGeneration` with v1.1.0 configuration
99+
- Enhanced `shouldIncludeFilePath` with v1.1.0 patterns
100+
- Updated `buildTypeIndex` for v1.1.0 version handling
101101

102102
#### 3. index.ts (swagger-generation)
103103
**Location:** `src/swagger-generation/src/index.ts`
104104

105105
**Changes:**
106-
- Fixed `writeSwaggerReadMeFile` to include v1.0.1 AutoRest configuration
107-
- Added v1.0.1 section to readme template
106+
- Fixed `writeSwaggerReadMeFile` to include v1.1.0 AutoRest configuration
107+
- Added v1.1.0 section to readme template
108108
- Ensured proper AutoRest setup for all API versions
109109

110110
### Test Coverage
@@ -113,15 +113,15 @@ if (isEnhanced) {
113113
**Location:** `src/swagger-generation/tests/swaggerWriter.test.ts`
114114

115115
**Coverage:**
116-
1. **Enhanced Beta Test**: Validates `beta/1.0.1-preview` with full relationship member objects
117-
2. **Enhanced v1.0.1 Test**: Validates `v1.0/1.0.1-preview` with full relationship member objects
116+
1. **Enhanced Beta Test**: Validates `beta/1.1.0-preview` with full relationship member objects
117+
2. **Enhanced v1.1.0 Test**: Validates `v1.0/1.1.0-preview` with full relationship member objects
118118
3. **Legacy v1.0 Test**: Validates `v1.0/1.0.0` maintains simple string arrays
119119

120120
**Test Results:** ✅ 11/11 tests passing
121121

122122
## API Version Comparison
123123

124-
### Enhanced Versions (beta/1.0.1-preview, v1.0/1.0.1-preview)
124+
### Enhanced Versions (beta/1.1.0-preview, v1.0/1.1.0-preview)
125125

126126
```json
127127
{
@@ -199,8 +199,8 @@ var servicePrincipals = filter(group.members, member => member.type == 'serviceP
199199
## Validation Results
200200

201201
### Production Validation
202-
-**Beta Swagger**: `microsoftgraph-beta-1.0.1-preview.json` contains enhanced relationshipMember
203-
-**v1.1 Swagger**: `microsoftgraph-v1.0-1.0.1-preview.json` contains enhanced relationshipMember
202+
-**Beta Swagger**: `microsoftgraph-beta-1.1.0-preview.json` contains enhanced relationshipMember
203+
-**v1.1 Swagger**: `microsoftgraph-v1.0-1.1.0-preview.json` contains enhanced relationshipMember
204204
-**v1.0 Swagger**: `microsoftgraph-v1.0-1.0.0.json` maintains string arrays (no relationshipMember)
205205

206206
### Test Validation
@@ -212,7 +212,7 @@ npm test -- swaggerWriter.test.ts
212212
### Generated Output Verification
213213
```powershell
214214
# Enhanced versions contain full object structure
215-
Get-Content src\swagger-generation\output\microsoftgraph-beta-1.0.1-preview.json |
215+
Get-Content src\swagger-generation\output\microsoftgraph-beta-1.1.0-preview.json |
216216
ConvertFrom-Json | Select-Object -ExpandProperty definitions |
217217
Select-Object -ExpandProperty "microsoft.graph.relationshipMember"
218218
@@ -234,7 +234,7 @@ Get-Content src\swagger-generation\output\microsoftgraph-v1.0-1.0.0.json |
234234
## Migration Path
235235

236236
### For New Implementations
237-
- Use enhanced versions (`beta/1.0.1-preview` or `v1.0/1.0.1-preview`)
237+
- Use enhanced versions (`beta/1.1.0-preview` or `v1.0/1.1.0-preview`)
238238
- Leverage rich relationship member objects for advanced scenarios
239239

240240
### For Existing Implementations
@@ -247,8 +247,8 @@ Get-Content src\swagger-generation\output\microsoftgraph-v1.0-1.0.0.json |
247247
### Version Detection Logic
248248
```typescript
249249
function isEnhancedRelationshipVersion(config: Config): boolean {
250-
return (config.APIVersion === 'beta' && config.ExtensionVersion === '1.0.1-preview') ||
251-
(config.APIVersion === 'v1.0' && config.ExtensionVersion === '1.0.1-preview');
250+
return (config.APIVersion === 'beta' && config.ExtensionVersion === '1.1.0-preview') ||
251+
(config.APIVersion === 'v1.0' && config.ExtensionVersion === '1.1.0-preview');
252252
}
253253
```
254254

generated/microsoftgraph/microsoft.graph/beta/1.0.1-preview/index.json renamed to generated/microsoftgraph/microsoft.graph/beta/1.1.0-preview/index.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,34 @@
11
{
22
"resources": {
33
"Microsoft.Graph/groups@beta": {
4-
"$ref": "types.json#/21"
4+
"$ref": "types.json#/23"
55
},
66
"Microsoft.Graph/applications@beta": {
7-
"$ref": "types.json#/77"
7+
"$ref": "types.json#/79"
88
},
99
"Microsoft.Graph/servicePrincipals@beta": {
10-
"$ref": "types.json#/95"
10+
"$ref": "types.json#/97"
1111
},
1212
"Microsoft.Graph/applications/federatedIdentityCredentials@beta": {
13-
"$ref": "types.json#/101"
13+
"$ref": "types.json#/103"
1414
},
1515
"Microsoft.Graph/oauth2PermissionGrants@beta": {
16-
"$ref": "types.json#/105"
16+
"$ref": "types.json#/107"
1717
},
1818
"Microsoft.Graph/appRoleAssignedTo@beta": {
19-
"$ref": "types.json#/109"
19+
"$ref": "types.json#/111"
2020
},
2121
"Microsoft.Graph/users@beta": {
22-
"$ref": "types.json#/114"
22+
"$ref": "types.json#/116"
2323
}
2424
},
2525
"resourceFunctions": {},
2626
"settings": {
2727
"name": "MicrosoftGraphBeta",
28-
"version": "1.0.1-preview",
28+
"version": "1.1.0-preview",
2929
"isSingleton": false,
3030
"configurationType": {
31-
"$ref": "types.json#/116"
31+
"$ref": "types.json#/117"
3232
}
3333
}
3434
}

generated/microsoftgraph/microsoft.graph/beta/1.0.1-preview/index.md renamed to generated/microsoftgraph/microsoft.graph/beta/1.1.0-preview/index.md

File renamed without changes.

0 commit comments

Comments
 (0)