Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into rhurey/samples_1.41
Browse files Browse the repository at this point in the history
  • Loading branch information
rhurey committed Oct 11, 2024
2 parents cf7591d + 0e8f2b8 commit 99b87e3
Show file tree
Hide file tree
Showing 109 changed files with 8,253 additions and 159 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ proguard-rules.pro text
*.config text
*.cpp text
*.cs text
*.cshtml text
*.csproj text
*.css text
*.editorconfig text
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/ingestion_client.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@ jobs:
- name: Install Bicep CLI
run: |
if ! command -v az bicep &> /dev/null; then
az bicep install
else
az bicep upgrade
BICEP_VERSION="v0.29.47"
if ! command -v az bicep &> /dev/null || [ "$(az bicep version --query 'bicepVersion' -o tsv)" != "$BICEP_VERSION" ]; then
az bicep install --version "$BICEP_VERSION"
fi
az bicep version
- name: Convert Bicep to ARM Template
Expand Down
34 changes: 34 additions & 0 deletions samples/csharp/web/avatar/Avatar.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.AI.OpenAI" Version="2.0.0-beta.5" />
<PackageReference Include="Azure.Identity" Version="1.12.0" />
<PackageReference Include="Microsoft.CognitiveServices.Speech" Version="1.40.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

<ItemGroup>
<Content Update="wwwroot\css\styles.css">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\image\background.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\image\favicon.ico">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\js\basic.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Update="wwwroot\js\chat.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>

</Project>
25 changes: 25 additions & 0 deletions samples/csharp/web/avatar/Avatar.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.10.35027.167
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avatar", "Avatar.csproj", "{9A644E20-F550-447F-832B-C7AAD0C0E20F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{9A644E20-F550-447F-832B-C7AAD0C0E20F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9A644E20-F550-447F-832B-C7AAD0C0E20F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9A644E20-F550-447F-832B-C7AAD0C0E20F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9A644E20-F550-447F-832B-C7AAD0C0E20F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {27B5668F-A2D4-4389-B5E1-49BE2AEA3D15}
EndGlobalSection
EndGlobal
Loading

0 comments on commit 99b87e3

Please sign in to comment.