microsoft
/
app-innovation-workshop
зеркало из https://github.com/microsoft/app-innovation-workshop.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Updates

This commit is contained in:
Robin-Manuel Thiel 2019-06-11 19:20:53 +02:00
Родитель d57a2e5d46
Коммит 25893983e7
7 изменённых файлов: 97 добавлений и 63 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

91
.vscode/launch.json поставляемый
Просмотреть файл

@ -1,46 +1,51 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": ".NET Core Launch (web)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/Backend/Monolithic/bin/Debug/netcoreapp2.0/ContosoMaintenance.WebAPI.dll",
"args": [],
"cwd": "${workspaceFolder}/Backend/Monolithic",
"stopAtEntry": false,
"internalConsoleOptions": "openOnSessionStart",
"launchBrowser": {
"enabled": true,
"args": "${auto-detect-url}",
"windows": {
"command": "cmd.exe",
"args": "/C start ${auto-detect-url}"
},
"osx": {
"command": "open"
},
"linux": {
"command": "xdg-open"
}
},
"env": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"sourceFileMap": {
"/Views": "${workspaceFolder}/Views"
}
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": ".NET Core Launch (web)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/Backend/Monolithic/bin/Debug/netcoreapp2.0/ContosoMaintenance.WebAPI.dll",
"args": [],
"cwd": "${workspaceFolder}/Backend/Monolithic",
"stopAtEntry": false,
"internalConsoleOptions": "openOnSessionStart",
"launchBrowser": {
"enabled": true,
"args": "${auto-detect-url}",
"windows": {
"command": "cmd.exe",
"args": "/C start ${auto-detect-url}"
},
{
"name": ".NET Core Attach",
"type": "coreclr",
"request": "attach",
"processId": "${command:pickProcess}"
"osx": {
"command": "open"
},
"linux": {
"command": "xdg-open"
}
]
}
},
"env": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"sourceFileMap": {
"/Views": "${workspaceFolder}/Views"
}
},
{
"name": ".NET Core Attach",
"type": "coreclr",
"request": "attach",
"processId": "${command:pickProcess}"
},
{
"name": "Functions",
"type": "coreclr",
"request": "attach",
"processId": "${command:azureFunctions.pickProcess}"
}
]
}

20
.vscode/settings.json поставляемый
Просмотреть файл

@ -1,11 +1,11 @@
{
"azureFunctions.projectLanguage": "C#",
"azureFunctions.projectRuntime": "beta",
"cSpell.words": [
"Contoso",
"Kubernetes",
"contosomaintenance",
"performant",
"robinmanuelthiel"
]
}
"azureFunctions.projectLanguage": "C#",
"azureFunctions.projectRuntime": "~2",
"cSpell.words": [
"Contoso",
"Kubernetes",
"contosomaintenance",
"performant",
"robinmanuelthiel"
]
}

30
.vscode/tasks.json поставляемый Normal file
Просмотреть файл

@ -0,0 +1,30 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "Build Functions",
"command": "dotnet",
"type": "process",
"args": [
"build",
"${workspaceFolder}/Backend/Functions/ContosoMaintenance.Functions.csproj"
],
"group": {
"kind": "build",
"isDefault": true
},
"problemMatcher": "$msCompile"
},
{
"label": "Start Functions Host",
"type": "shell",
"dependsOn": "Build Functions",
"options": {
"cwd": "${workspaceFolder}/Backend/Functions/bin/Debug/netcoreapp2.2"
},
"command": "func host start",
"isBackground": true,
"problemMatcher": "$func-watch"
}
]
}

11
Backend/Functions/ContosoMaintenance.Functions.csproj
Просмотреть файл

@ -1,12 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<AzureFunctionsVersion>v2</AzureFunctionsVersion>
<TargetFramework>netcoreapp2.2</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.19" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.CosmosDB" Version="3.0.1-beta1" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="3.0.0-beta8" />
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="1.0.28" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.CosmosDB" Version="3.0.3" />
<PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="3.0.6" />
</ItemGroup>
<ItemGroup>
<None Update="host.json">
@ -17,4 +16,4 @@
<CopyToPublishDirectory>Never</CopyToPublishDirectory>
</None>
</ItemGroup>
</Project>
</Project>

2
Mobile/UITests/Tests.cs
Просмотреть файл

@ -57,7 +57,7 @@ namespace ContosoFieldService.UITests
Assert.IsTrue(app.Query("jobItem").Any(), "No Jobs found.");
// Open last job on page
var lastJobName = app.Query("lblName").LastOrDefault()?.Text;
var lastJobName = app.Query("lblName").FirstOrDefault()?.Text;
Assert.IsTrue(lastJobName != null, "No Job Title Element found to click on.");
app.Tap(lastJobName);
app.WaitForElement(jobsDetailsPage.JobName);

2
Mobile/iOS/AppDelegate.cs
Просмотреть файл

@ -27,7 +27,7 @@ namespace ContosoFieldService.iOS
// HACK: Get the linker to behave
var ignore = new CircleTransformation();
#if ENABLE_TEST_CLOUD
#if ENABLE_TEST_CLOUD || DEBUG
// Code for starting up the Xamarin Test Cloud Agent
Xamarin.Calabash.Start();
#endif

4
Terraform/functions.tf
Просмотреть файл

@ -22,8 +22,8 @@ resource "azurerm_function_app" "workshop" {
app_settings {
APPINSIGHTS_INSTRUMENTATIONKEY = "${azurerm_application_insights.workshop.instrumentation_key}"
CosmosDB = "AccountEndpoint=${azurerm_cosmosdb_account.workshop.endpoint};AccountKey=${azurerm_cosmosdb_account.workshop.primary_master_key};"
FUNCTIONS_WORKER_RUNTIME = "dotnet"
CosmosDB = "AccountEndpoint=${azurerm_cosmosdb_account.workshop.endpoint};AccountKey=${azurerm_cosmosdb_account.workshop.primary_master_key};"
CognitiveServicesEndpoint = "${azurerm_template_deployment.workshop.outputs["vision_endpoint"]}"
CognitiveServicesKey = "${azurerm_template_deployment.workshop.outputs["vision_key"]}"