Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Building 1.2.0 version #23

Merged
merged 1 commit into from
Jul 9, 2024
Merged

Building 1.2.0 version #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/dotnet-aspire/.devcontainer/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SA_PASSWORD=P@ssw0rd!
MSSQL_SA_PASSWORD=P@ssw0rd!
2 changes: 1 addition & 1 deletion src/dotnet-aspire/.devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"database": "master",
"authenticationType": "SqlLogin",
"user": "sa",
"password": "${env:SA_PASSWORD}",
"password": "${env:MSSQL_SA_PASSWORD}",
"savePassword": true,
"profileName": "LocalDev",
"trustServerCertificate": true
Expand Down
2 changes: 1 addition & 1 deletion src/dotnet-aspire/.devcontainer/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ services:
# (Adding the "ports" property to this file will not forward from a Codespace.)

db:
image: mcr.microsoft.com/mssql/server:2022-latest
image: mcr.microsoft.com/azure-sql-edge
hostname: SQL-Library
container_name: SQL-Library
restart: unless-stopped
Expand Down
2 changes: 1 addition & 1 deletion src/dotnet-aspire/.devcontainer/sql/postCreateCommand.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dacpac="false"

# Load SA_PASSWORD from .env file
export $(grep -v '^#' .devcontainer/.env | xargs)
SApassword=$SA_PASSWORD
SApassword=$MSSQL_SA_PASSWORD

# Parameters
dacpath=$1
Expand Down
10 changes: 5 additions & 5 deletions src/dotnet-aspire/.vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "2.0.0",
"tasks": [
{
"label": "Verify database schema and data",
"label": "1. Verify database schema and data",
"type": "shell",
"command": "code",
"args": [
Expand All @@ -17,15 +17,15 @@
}
},
{
"label": "Build SQL Database project",
"label": "2. Build SQL Database project",
"type": "shell",
"command": "dotnet build",
"options": {
"cwd": "${workspaceFolder}/database/Library"
}
},
{
"label": "Deploy SQL Database project",
"label": "3. Publish SQL Database project",
"type": "shell",
"command": "bash",
"args": [
Expand All @@ -34,12 +34,12 @@
]
},
{
"label": "Update .NET SDK",
"label": "4. Update .NET SDK",
"type": "shell",
"command": "sudo dotnet workload update"
},
{
"label": "Trust .NET HTTPS certificate",
"label": "5. Trust .NET HTTPS certificate",
"type": "shell",
"command": "dotnet dev-certs https --trust"
}
Expand Down
2 changes: 1 addition & 1 deletion src/dotnet-aspire/NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ This task builds the SQL Database project. It runs the command `dotnet build` in

This task is optional, but it's useful to verify the database schema. You can use this SQL Database project to make changes to the database schema and deploy it to the SQL Server container.

#### Deploy SQL Database Project
#### Publish SQL Database project

This task involves deploying the SQL Database project to your SQL Server container. It executes the `postCreateCommand.sh` script found in the `.devcontainer/sql` directory of your workspace.

Expand Down
5 changes: 2 additions & 3 deletions src/dotnet-aspire/devcontainer-template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "dotnet-aspire",
"version": "1.1.0",
"version": "1.2.0",
"name": ".NET with Aspire and Azure SQL",
"description": "A development environment for .NET Aspire and Azure SQL, enabling streamlined local development and testing.",
"documentationURL": "https://github.com/microsoft/azuresql-devcontainers/tree/main/src/dotnet-aspire",
Expand All @@ -12,8 +12,7 @@
"description": ".NET version:",
"proposals": [
"8.0-bookworm",
"8.0-jammy",
"8.0-bullseye"
"8.0-jammy"
],
"default": "8.0-bookworm"
}
Expand Down
2 changes: 1 addition & 1 deletion src/dotnet/.devcontainer/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SA_PASSWORD=P@ssw0rd!
MSSQL_SA_PASSWORD=P@ssw0rd!
2 changes: 1 addition & 1 deletion src/dotnet/.devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"database": "master",
"authenticationType": "SqlLogin",
"user": "sa",
"password": "${env:SA_PASSWORD}",
"password": "${env:MSSQL_SA_PASSWORD}",
"savePassword": true,
"profileName": "LocalDev",
"trustServerCertificate": true
Expand Down
2 changes: 1 addition & 1 deletion src/dotnet/.devcontainer/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ services:
# (Adding the "ports" property to this file will not forward from a Codespace.)

db:
image: mcr.microsoft.com/mssql/server:2022-latest
image: mcr.microsoft.com/azure-sql-edge
hostname: SQL-Library
container_name: SQL-Library
restart: unless-stopped
Expand Down
2 changes: 1 addition & 1 deletion src/dotnet/.devcontainer/sql/postCreateCommand.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dacpac="false"

# Load SA_PASSWORD from .env file
export $(grep -v '^#' .devcontainer/.env | xargs)
SApassword=$SA_PASSWORD
SApassword=$MSSQL_SA_PASSWORD

# Parameters
dacpath=$1
Expand Down
8 changes: 4 additions & 4 deletions src/dotnet/.vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "2.0.0",
"tasks": [
{
"label": "Verify database schema and data",
"label": "1. Verify database schema and data",
"type": "shell",
"command": "code",
"args": [
Expand All @@ -17,15 +17,15 @@
}
},
{
"label": "Build SQL Database project",
"label": "2. Build SQL Database project",
"type": "shell",
"command": "dotnet build",
"options": {
"cwd": "${workspaceFolder}/database/Library"
}
},
{
"label": "Deploy SQL Database project",
"label": "3. Publish SQL Database project",
"type": "shell",
"command": "bash",
"args": [
Expand All @@ -34,7 +34,7 @@
]
},
{
"label": "Trust .NET HTTPS certificate",
"label": "4. Trust .NET HTTPS certificate",
"type": "shell",
"command": "dotnet dev-certs https --trust"
}
Expand Down
2 changes: 1 addition & 1 deletion src/dotnet/NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ This task builds the SQL Database project. It runs the command `dotnet build` in

This task is optional, but it's useful to verify the database schema. You can use this SQL Database project to make changes to the database schema and deploy it to the SQL Server container.

#### Deploy SQL Database Project
#### Publish SQL Database project

This task involves deploying the SQL Database project to your SQL Server container. It executes the `postCreateCommand.sh` script found in the `.devcontainer/sql` directory of your workspace.

Expand Down
5 changes: 2 additions & 3 deletions src/dotnet/devcontainer-template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "dotnet",
"version": "1.1.0",
"version": "1.2.0",
"name": ".NET and Azure SQL",
"description": "A development environment for .NET and Azure SQL, enabling streamlined local development and testing.",
"documentationURL": "https://github.com/microsoft/azuresql-devcontainers/tree/main/src/dotnet",
Expand All @@ -12,8 +12,7 @@
"description": ".NET version:",
"proposals": [
"8.0-bookworm",
"8.0-jammy",
"8.0-bullseye"
"8.0-jammy"
],
"default": "8.0-bookworm"
}
Expand Down
2 changes: 1 addition & 1 deletion src/javascript-node/.devcontainer/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SA_PASSWORD=P@ssw0rd!
MSSQL_SA_PASSWORD=P@ssw0rd!
2 changes: 1 addition & 1 deletion src/javascript-node/.devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"database": "master",
"authenticationType": "SqlLogin",
"user": "sa",
"password": "${env:SA_PASSWORD}",
"password": "${env:MSSQL_SA_PASSWORD}",
"savePassword": true,
"profileName": "LocalDev",
"trustServerCertificate": true
Expand Down
2 changes: 1 addition & 1 deletion src/javascript-node/.devcontainer/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ services:
# (Adding the "ports" property to this file will not forward from a Codespace.)

db:
image: mcr.microsoft.com/mssql/server:2022-latest
image: mcr.microsoft.com/azure-sql-edge
hostname: SQL-Library
container_name: SQL-Library
restart: unless-stopped
Expand Down
2 changes: 1 addition & 1 deletion src/javascript-node/.devcontainer/sql/postCreateCommand.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dacpac="false"

# Load SA_PASSWORD from .env file
export $(grep -v '^#' .devcontainer/.env | xargs)
SApassword=$SA_PASSWORD
SApassword=$MSSQL_SA_PASSWORD

# Parameters
dacpath=$1
Expand Down
6 changes: 3 additions & 3 deletions src/javascript-node/.vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "2.0.0",
"tasks": [
{
"label": "Verify database schema and data",
"label": "1. Verify database schema and data",
"type": "shell",
"command": "code",
"args": [
Expand All @@ -17,15 +17,15 @@
}
},
{
"label": "Build SQL Database project",
"label": "2. Build SQL Database project",
"type": "shell",
"command": "dotnet build",
"options": {
"cwd": "${workspaceFolder}/database/Library"
}
},
{
"label": "Deploy SQL Database project",
"label": "3. Publish SQL Database project",
"type": "shell",
"command": "bash",
"args": [
Expand Down
2 changes: 1 addition & 1 deletion src/javascript-node/NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ This task builds the SQL Database project. It runs the command `dotnet build` in

This task is optional, but it's useful to verify the database schema. You can use this SQL Database project to make changes to the database schema and deploy it to the SQL Server container.

#### Deploy SQL Database Project
#### Deploy SQL Database project

This task involves deploying the SQL Database project to your SQL Server container. It executes the `postCreateCommand.sh` script found in the `.devcontainer/sql` directory of your workspace.

Expand Down
2 changes: 1 addition & 1 deletion src/javascript-node/devcontainer-template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "javascript-node",
"version": "1.1.0",
"version": "1.2.0",
"name": "Node.js and Azure SQL",
"description": "A development environment for Node.js and Azure SQL, enabling streamlined local development and testing.",
"documentationURL": "https://github.com/microsoft/azuresql-devcontainers/tree/main/src/javascript-node",
Expand Down
2 changes: 1 addition & 1 deletion src/python/.devcontainer/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
SA_PASSWORD=P@ssw0rd!
MSSQL_SA_PASSWORD=P@ssw0rd!
2 changes: 1 addition & 1 deletion src/python/.devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"database": "master",
"authenticationType": "SqlLogin",
"user": "sa",
"password": "${env:SA_PASSWORD}",
"password": "${env:MSSQL_SA_PASSWORD}",
"savePassword": true,
"profileName": "LocalDev",
"trustServerCertificate": true
Expand Down
2 changes: 1 addition & 1 deletion src/python/.devcontainer/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ services:
# (Adding the "ports" property to this file will not forward from a Codespace.)

db:
image: mcr.microsoft.com/mssql/server:2022-latest
image: mcr.microsoft.com/azure-sql-edge
hostname: SQL-Library
container_name: SQL-Library
restart: unless-stopped
Expand Down
2 changes: 1 addition & 1 deletion src/python/.devcontainer/sql/postCreateCommand.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dacpac="false"

# Load SA_PASSWORD from .env file
export $(grep -v '^#' .devcontainer/.env | xargs)
SApassword=$SA_PASSWORD
SApassword=$MSSQL_SA_PASSWORD

# Parameters
dacpath=$1
Expand Down
6 changes: 3 additions & 3 deletions src/python/.vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "2.0.0",
"tasks": [
{
"label": "Verify database schema and data",
"label": "1. Verify database schema and data",
"type": "shell",
"command": "code",
"args": [
Expand All @@ -17,15 +17,15 @@
}
},
{
"label": "Build SQL Database project",
"label": "2. Build SQL Database project",
"type": "shell",
"command": "dotnet build",
"options": {
"cwd": "${workspaceFolder}/database/Library"
}
},
{
"label": "Deploy SQL Database project",
"label": "3. Publish SQL Database project",
"type": "shell",
"command": "bash",
"args": [
Expand Down
2 changes: 1 addition & 1 deletion src/python/NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ This task builds the SQL Database project. It runs the command `dotnet build` in

This task is optional, but it's useful to verify the database schema. You can use this SQL Database project to make changes to the database schema and deploy it to the SQL Server container.

#### Deploy SQL Database Project
#### Publish SQL Database project

This task involves deploying the SQL Database project to your SQL Server container. It executes the `postCreateCommand.sh` script found in the `.devcontainer/sql` directory of your workspace.

Expand Down
2 changes: 1 addition & 1 deletion src/python/devcontainer-template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"id": "python",
"version": "1.1.0",
"version": "1.2.0",
"name": "Python and Azure SQL",
"description": "A development environment for Python and Azure SQL, enabling streamlined local development and testing.",
"documentationURL": "https://github.com/microsoft/azuresql-devcontainers/tree/main/src/python",
Expand Down
5 changes: 4 additions & 1 deletion test/dotnet-aspire/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
*-------------------------------------------------------------------------------------------------------------*/

using System;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http;
Expand Down Expand Up @@ -42,7 +43,9 @@ public static void Main(string[] args)
.UseKestrel()
.UseUrls("http://0.0.0.0:8090")
.Configure(app => app.Run(async context => {
await context.Response.WriteAsync("The databases are: " + databaseNames);
string responseText = "The databases are: " + databaseNames;
Console.WriteLine(responseText); // Log to console
await context.Response.WriteAsync(responseText); // Send to client
}))
.Build();

Expand Down
2 changes: 1 addition & 1 deletion test/dotnet-aspire/obj/Debug/net8.0/aspnetapp.AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("aspnetapp")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+9c33fa073eb55d6469f3e41a4b798955f6fabd32")]
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+6b63c86964252aae93d2225e26186cb031bdb14d")]
[assembly: System.Reflection.AssemblyProductAttribute("aspnetapp")]
[assembly: System.Reflection.AssemblyTitleAttribute("aspnetapp")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
Expand Down
2 changes: 1 addition & 1 deletion test/dotnet-aspire/obj/Debug/net8.0/aspnetapp.AssemblyInfoInputs.cache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d7386fb4f8f1c61d2bab9d0759d5573b8a8e5df3aa8bde9e86de07cabb306bf3
c8dd5953b06c5d2c8d6068b708b6ac5b410ab5dcf27381795b860b17aa8a96e2
Binary file modified test/dotnet-aspire/obj/Debug/net8.0/aspnetapp.assets.cache
View file
Open in desktop
Binary file not shown.
Binary file removed test/dotnet-aspire/obj/Debug/net8.0/aspnetapp.csproj.AssemblyReference.cache
View file
Open in desktop
Binary file not shown.
5 changes: 4 additions & 1 deletion test/dotnet/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
*-------------------------------------------------------------------------------------------------------------*/

using System;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Http;
Expand Down Expand Up @@ -42,7 +43,9 @@ public static void Main(string[] args)
.UseKestrel()
.UseUrls("http://0.0.0.0:8090")
.Configure(app => app.Run(async context => {
await context.Response.WriteAsync("The databases are: " + databaseNames);
string responseText = "The databases are: " + databaseNames;
Console.WriteLine(responseText); // Log to console
await context.Response.WriteAsync(responseText); // Send to client
}))
.Build();

Expand Down
Binary file added test/dotnet/bin/Debug/net8.0/Azure.Core.dll
View file
Open in desktop
Binary file not shown.
Binary file added test/dotnet/bin/Debug/net8.0/Azure.Identity.dll
View file
Open in desktop
Binary file not shown.
Binary file added test/dotnet/bin/Debug/net8.0/Microsoft.Bcl.AsyncInterfaces.dll
View file
Open in desktop
Binary file not shown.
Binary file added test/dotnet/bin/Debug/net8.0/Microsoft.Data.SqlClient.dll
View file
Open in desktop
Binary file not shown.
Binary file added test/dotnet/bin/Debug/net8.0/Microsoft.Identity.Client.Extensions.Msal.dll
View file
Open in desktop
Binary file not shown.
Binary file added test/dotnet/bin/Debug/net8.0/Microsoft.Identity.Client.dll
View file
Open in desktop
Binary file not shown.
Binary file added test/dotnet/bin/Debug/net8.0/Microsoft.IdentityModel.JsonWebTokens.dll
View file
Open in desktop
Binary file not shown.
Binary file added test/dotnet/bin/Debug/net8.0/Microsoft.IdentityModel.Logging.dll
View file
Open in desktop
Binary file not shown.
Binary file added test/dotnet/bin/Debug/net8.0/Microsoft.IdentityModel.Protocols.OpenIdConnect.dll
View file
Open in desktop
Binary file not shown.
Binary file added test/dotnet/bin/Debug/net8.0/Microsoft.IdentityModel.Protocols.dll
View file
Open in desktop
Binary file not shown.
Binary file added test/dotnet/bin/Debug/net8.0/Microsoft.IdentityModel.Tokens.dll
View file
Open in desktop
Binary file not shown.
Binary file added test/dotnet/bin/Debug/net8.0/Microsoft.Win32.SystemEvents.dll
View file
Open in desktop
Binary file not shown.
Binary file added test/dotnet/bin/Debug/net8.0/System.Configuration.ConfigurationManager.dll
View file
Open in desktop
Binary file not shown.
Binary file added test/dotnet/bin/Debug/net8.0/System.Drawing.Common.dll
View file
Open in desktop
Binary file not shown.
Binary file added test/dotnet/bin/Debug/net8.0/System.IdentityModel.Tokens.Jwt.dll
View file
Open in desktop
Binary file not shown.
Binary file added test/dotnet/bin/Debug/net8.0/System.Runtime.Caching.dll
View file
Open in desktop
Binary file not shown.
Binary file added test/dotnet/bin/Debug/net8.0/System.Security.Cryptography.ProtectedData.dll
View file
Open in desktop
Binary file not shown.
Binary file added test/dotnet/bin/Debug/net8.0/System.Security.Permissions.dll
View file
Open in desktop
Binary file not shown.
Binary file added test/dotnet/bin/Debug/net8.0/System.Windows.Extensions.dll
View file
Open in desktop
Binary file not shown.
Binary file added test/dotnet/bin/Debug/net8.0/aspnetapp
View file
Open in desktop
Binary file not shown.
Loading
Loading