Skip to content

Commit 0e22c82

Browse files
committed
catch up pre-merge
1 parent c7b17ef commit 0e22c82

File tree

3 files changed

+81
-3
lines changed

3 files changed

+81
-3
lines changed

.vscode/launch.json

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
{
2+
// Use IntelliSense to learn about possible attributes.
3+
// Hover to view descriptions of existing attributes.
4+
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
5+
"version": "0.2.0",
6+
"configurations": [
7+
{
8+
// Use IntelliSense to find out which attributes exist for C# debugging
9+
// Use hover for the description of the existing attributes
10+
// For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md
11+
"name": ".NET Core Launch (web)",
12+
"type": "coreclr",
13+
"request": "launch",
14+
"preLaunchTask": "build",
15+
// If you have changed target frameworks, make sure to update the program path.
16+
"program": "${workspaceFolder}/launcher-csharp/bin/Debug/netcoreapp3.1/launcher-csharp.dll",
17+
"args": [],
18+
"cwd": "${workspaceFolder}/launcher-csharp",
19+
"stopAtEntry": false,
20+
// Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
21+
"serverReadyAction": {
22+
"action": "openExternally",
23+
"pattern": "\\bNow listening on:\\s+(https?://\\S+)"
24+
},
25+
"env": {
26+
"ASPNETCORE_ENVIRONMENT": "Development"
27+
},
28+
"sourceFileMap": {
29+
"/Views": "${workspaceFolder}/Views"
30+
}
31+
},
32+
{
33+
"name": ".NET Core Attach",
34+
"type": "coreclr",
35+
"request": "attach"
36+
}
37+
]
38+
}

.vscode/tasks.json

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{
2+
"version": "2.0.0",
3+
"tasks": [
4+
{
5+
"label": "build",
6+
"command": "dotnet",
7+
"type": "process",
8+
"args": [
9+
"build",
10+
"${workspaceFolder}/launcher-csharp/launcher-csharp.csproj",
11+
"/property:GenerateFullPaths=true",
12+
"/consoleloggerparameters:NoSummary"
13+
],
14+
"problemMatcher": "$msCompile"
15+
},
16+
{
17+
"label": "publish",
18+
"command": "dotnet",
19+
"type": "process",
20+
"args": [
21+
"publish",
22+
"${workspaceFolder}/launcher-csharp/launcher-csharp.csproj",
23+
"/property:GenerateFullPaths=true",
24+
"/consoleloggerparameters:NoSummary"
25+
],
26+
"problemMatcher": "$msCompile"
27+
},
28+
{
29+
"label": "watch",
30+
"command": "dotnet",
31+
"type": "process",
32+
"args": [
33+
"watch",
34+
"run",
35+
"--project",
36+
"${workspaceFolder}/launcher-csharp/launcher-csharp.csproj"
37+
],
38+
"problemMatcher": "$msCompile"
39+
}
40+
]
41+
}

launcher-csharp/Admin/Examples/CreateUser.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ public static (PermissionProfileInformation, GroupInformation) GetPermissionProf
9696
/// <param name="permissionProfileId">The permission profile ID that will be used for a new user</param>
9797
/// <param name="groupId">The group ID that will be used for a new user</param>
9898
/// <returns>The request for creating a new user</returns>
99+
//ds-snippet-start:Admin1Step5
99100
private static NewUserRequest ConstructNewUserRequest(
100101
long permissionProfileId,
101102
long groupId,
@@ -107,7 +108,6 @@ private static NewUserRequest ConstructNewUserRequest(
107108
{
108109
return new NewUserRequest
109110
{
110-
// Step 3 start
111111
FirstName = firstName,
112112
LastName = lastName,
113113
UserName = userName,
@@ -131,9 +131,8 @@ private static NewUserRequest ConstructNewUserRequest(
131131
},
132132
},
133133
AutoActivateMemberships = true,
134-
135-
// Step 3 end
136134
};
137135
}
136+
//ds-snippet-end:Admin1Step5
138137
}
139138
}

0 commit comments

Comments
 (0)