Merge pull request #5 from HeidiSteen/main

Standardized on C# and updated readmes

Author: HeidiSteen

README.md

@@ -3,13 +3,13 @@
 
 This code sample builds a web site on Azure to search through a catalog of books. Searchable content is indexed and queried on Azure AI Search, and a static web app provides the search experience.
 
-This sample includes two programs and an Azure function.
+This C# sample includes two programs and an Azure function.
 
 | components | Description |
 |---------|-------------|
-| bulk-insert app | Creates and loads the "goodbooks" index on Azure AI Search. It demonstrates index creation and batch mode indexing. Sample data is loaded from the [azure-search-sample-data](https://github.com/Azure-Samples/azure-search-sample-data/tree/main/good-books) repository. To run this program, you must have write permissions on Azure AI Search. <p>This program is available in three languages: <br>/dotnet/bulk-insert <br>/python/bulk-insert <br>/javascript/bulk-insert|
+| bulk-insert app | Creates and loads the "goodbooks" index on Azure AI Search. It demonstrates index creation and batch mode indexing. Sample data is loaded from the [azure-search-sample-data](https://github.com/Azure-Samples/azure-search-sample-data/tree/main/good-books) repository.|
 | client app | Provides the client code. The web front-end includes a search page with faceted navigation, a search bar for free form search and suggested queries, and tabbed page results. It's written in JavaScript, uses Node.js for the runtime, and uses React libraries for user interaction. |
-| api | Provides the Azure function used by the client to send queries to the search index. <p>The function is available in three languages: <br>/dotnet/api (.NET) <br>/python/api <br>/javascript/api |
+| api | Provides the Azure function used by the client to send queries to the search index. |
 
 This README is an shortened version of the [full tutorial](https://aka.ms/search-website-tutorial) and provides just the steps for running the sample. For more information and screenshots, see the tutorial.
 
@@ -24,9 +24,7 @@ This README is an shortened version of the [full tutorial](https://aka.ms/search
 
 You should also have the Visual Studio code extension for the language used for building the index:
 
-* [Python extension for Visual Studio Code](https://code.visualstudio.com/docs/languages/python) and a recent version of Python.
-* [JavaScript extensions for VS Code](https://code.visualstudio.com/docs/nodejs/extensions).
-* [Using .NET in Visual Studio Code](https://code.visualstudio.com/docs/languages/dotnet) and a recent of the .NET SDK.
+* [Using .NET in Visual Studio Code](https://code.visualstudio.com/docs/languages/dotnet) and a recent of the .NET SDK
 
 ## Download sample repository
 
@@ -42,32 +40,22 @@ You should also have the Visual Studio code extension for the language used for
 
 ## Run Bulk Insert
 
-Use any one of the following language versions to build the good-books index. Instructions are provided in individual readme files. All of these programs assume Visual Studio Code as the IDE with the appropriate language extensions and executables.
+Build the good-books index using the instructions provided in the readme.To run this program, you need the search endpoint and [API keys](https://learn.microsoft.com/azure/search/search-security-api-keys#find-existing-keys). You can find this information in the Azure portal.
 
-* [/dotnet/bulk-insert/readme](/dotnet/bulk-insert/readme.md)
-
-* [/javascript/bulk-insert/readme](/javascript/bulk-insert/readme.md)
-
-* [/python/bulk-insert/readme](/python/bulk-insert/readme.md)
-
-To run any of these programs, you need the search endpoint and [API keys](https://learn.microsoft.com/azure/search/search-security-api-keys#find-existing-keys). You can find this information in the Azure portal.
+* [bulk-insert/readme](/bulk-insert/readme.md)
 
 ## Deploy the static web app
 
 Once you have the good-books index on Azure AI Search, you can deploy a static web app as your search client.
 
-Deploy the app from Visual Studio Code using the **Create Static Web App (Advanced)** wizard. In the wizard, you are prompted to set the location of your application code. This is the "language-of-choice"/api folder containing the Azure function, using for making calls to Azure AI Search.
+Deploy the app from Visual Studio Code using the **Create Static Web App (Advanced)** wizard. In the wizard, you are prompted to set the location of your static web app source code. This is the "client" folder. This project uses the default "api" folder for the Azure function. The wizard assumes the default location. 
 
 1. In Visual Studio Code in Explorer, make sure you're at the repository root, and not the bulk-insert folder (for example, `azure-search-static-web-app`).
 
 1. Select **Azure** from the Activity Bar, then open **Resources** from the side bar. 
 
 1. Right-click **Static Web Apps** and then select **Create Static Web App (Advanced)**. If you don't see this option, verify that you have the Azure Functions extension for Visual Studio Code.
 
-1. If you see a pop-up window in Visual Studio Code asking which branch you want to deploy from, select the default branch, usually **main**. 
-
-    This setting means only changes you commit to that branch are deployed to your static web app. 
-
 1. If you see a pop-up window asking you to commit your changes, don't do this. The secrets from the bulk import step shouldn't be committed to the repository. 
 
     To roll back the changes, open an integrated terminal window and type `git checkout .` to undo the commit.
@@ -82,7 +70,6 @@ Deploy the app from Visual Studio Code using the **Create Static Web App (Advanc
     |Select a region | We recommend `West US 2`. |
     |Choose build preset to configure default project structure. |Select **Custom**. |
     |Select the location of your client application code | `client` (no leading forward slash) <br><br>This is the path, from the root of the repository, to your static web app. |
-    |Select the location of your function code | `dotnet\api`, for example.<br><br>Azure functions are provided in three languages. You can choose any one of them. |
     |Enter the path of your build output... | `build`<br><br>This is the path, from your static web app, to your generated files.|
 
     If you get an error about an incorrect region, make sure the resource group and static web app resource are in one of the supported regions listed in the error response. 
@@ -94,36 +81,6 @@ Deploy the app from Visual Studio Code using the **Create Static Web App (Advanc
    * Select **Open Actions in GitHub** from the Notifications. This opens a browser window pointed to your forked repo.
    * Select the **Actions** tab in your forked repository. You should see a list of all workflows on your fork.
 
-   It's expected that the workflow succeeds. However, the Git workflow builds the YML file using a backward slash file delimiter, resulting in an invalid path for locating the API folder. Inside theBuild and Deploy Job output, you'll find a warning similar to this: "`[WARNING] Api Directory Location: 'javascriptpi' could not be found. Azure Functions will not be created. Either no Api directory was specified, or the specified directory was not found. Azure Functions will not be created.`".
-
-1. Edit the YML to change the backward slash to a forward slash. You can perform this step as soon as the YML file is created. A new workflow launches as soon as you push the updates.
-
-   1. In Visual Studio Code explorer, open the `./.github/workflows/` directory.
-
-   1. Open the YML file.
-
-   1. Scroll to the `api-location` path (on or near line 31).
-
-   1. Replace the backslash (`dotnet\api`) with a forward slash (`dotnet/api`). This is the only line that needs editing, other locations are here for context:
-
-      ```yml
-      app_location: "client" # App source code path
-      api_location: "dotnet/api" # Api source code path - optional
-      output_location: "build" # Built app content directory - optional
-      ```
-
-   1. Save the file.
-
-   1. Open an integrated terminal and issue the following GitHub commands to send the updated YML to your fork:
-
-      ```bash
-      git add -A
-      git commit -m "fix path"
-      git push origin main
-      ```
-
-    Wait until the workflow execution completes before continuing. This may take a minute or two to finish. 
-
 ## Get the Azure AI Search query key in Visual Studio Code
 
 1. In Visual Studio Code, open a new terminal window.

dotnet/api/Lookup.cs renamed to api/Lookup.cs

@@ -0,0 +1,10 @@
+using Microsoft.Extensions.Hosting;
+using Microsoft.Azure.Functions.Worker.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Configuration;
+
+var host = new HostBuilder()
+    .ConfigureFunctionsWorkerDefaults()
+    .Build();
+
+host.Run();

dotnet/api/Models.cs renamed to api/Models.cs

@@ -4,7 +4,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
+    <Nullable>disable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>

api/Program.cs

@@ -2,14 +2,16 @@
 
 1. Check your search service to make sure you have room for an extra index. The Usage tab in the Azure portal's search service page provides this information. The maximum limit on the free tier is 3 indexes. The maximum limit on the basic tier is 15 indexes.
 
+1. Check your search service to make sure it allows API keys. API key settings can be found in the **Settings > Keys** page in the Azure portal's search service page.
+
 1. Change the following values in the `Program.cs` file:
 
     * YOUR-SEARCH-RESOURCE-NAME (not the full URL)
     * YOUR-SEARCH-ADMIN-KEY
 
 1. Open an integrated terminal in Visual Studio Code.
 
-1. Make sure the path is "azure-search-static-web-app/dotnet/bulk-insert".
+1. Make sure the path is "azure-search-static-web-app/bulk-insert".
 
 1. Install dependencies: