Skip to content

Commit

Permalink
1914 Change the name of the solution (#2179)
Browse files Browse the repository at this point in the history
  • Loading branch information
delager authored and kbeaugrand committed Jun 22, 2023
1 parent 8a45502 commit 7fdb40c
Show file tree
Hide file tree
Showing 736 changed files with 11,066 additions and 10,717 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ updates:
interval: "daily"
# Maintain dependencies for the web client
- package-ecosystem: "npm"
directory: "/src/AzureIoTHub.Portal/Client"
directory: "/src/IoTHub.Portal/Client"
schedule:
interval: "daily"
6 changes: 3 additions & 3 deletions .github/workflows/ci-open-api-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ jobs:
working-directory: src/

- name: Restore dependencies
run: dotnet restore AzureIoTHub.Portal.sln
run: dotnet restore IoTHub.Portal.sln
working-directory: src/

- name: Build
run: dotnet build AzureIoTHub.Portal.sln --no-restore -p:ClientAssetsRestoreCommand="npm ci"
run: dotnet build IoTHub.Portal.sln --no-restore -p:ClientAssetsRestoreCommand="npm ci"
working-directory: src/

- name: Generate Open API documentation
run: dotnet swagger tofile --output ./swagger.json AzureIoTHub.Portal.Server/bin/Debug/net7.0/AzureIoTHub.Portal.Server.dll v1
run: dotnet swagger tofile --output ./swagger.json IoTHub.Portal.Server/bin/Debug/net7.0/IoTHub.Portal.Server.dll v1
working-directory: src/

# Upload swagger docs to GitHub
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/ci-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,30 +37,30 @@ jobs:
working-directory: src/

- name: Restore dependencies
run: dotnet restore AzureIoTHub.Portal.sln
run: dotnet restore IoTHub.Portal.sln
working-directory: src/

- name: Build
run: dotnet build AzureIoTHub.Portal.sln --no-restore -p:ClientAssetsRestoreCommand="npm ci"
run: dotnet build IoTHub.Portal.sln --no-restore -p:ClientAssetsRestoreCommand="npm ci"
working-directory: src/

- name: Run unit tests
run: dotnet test --no-build --verbosity normal --logger trx --collect:"XPlat Code Coverage" AzureIoTHub.Portal.Tests.Unit.csproj
working-directory: src/AzureIoTHub.Portal.Tests.Unit/
run: dotnet test --no-build --verbosity normal --logger trx --collect:"XPlat Code Coverage" IoTHub.Portal.Tests.Unit.csproj
working-directory: src/IoTHub.Portal.Tests.Unit/

# Upload test results as artifact
- uses: actions/upload-artifact@v3
if: success() || failure()
with:
name: test-results
path: |
src/AzureIoTHub.Portal.Tests.Unit/TestResults
src/IoTHub.Portal.Tests.Unit/TestResults
- name: Upload to Codecov test reports
uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
directory: src/AzureIoTHub.Portal.Tests.Unit/TestResults
directory: src/IoTHub.Portal.Tests.Unit/TestResults
verbose: true # optional (default = false)

#e2e-tests:
Expand Down Expand Up @@ -134,8 +134,8 @@ jobs:
# run: sudo apt-get install google-chrome-stable

# - name: Run E2E tests
# run: dotnet test AzureIoTHub.Portal.Tests.E2E.csproj
# working-directory: src/AzureIoTHub.Portal.Tests.E2E/
# run: dotnet test IoTHub.Portal.Tests.E2E.csproj
# working-directory: src/IoTHub.Portal.Tests.E2E/
# env:
# E2E_USERNAME: ${{ vars.E2E_USERNAME }}
# E2E_PASSWORD: ${{ secrets.E2E_PASSWORD }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
queries: +security-and-quality,security-extended

- name: Build
run: dotnet build AzureIoTHub.Portal.sln --configuration Release
run: dotnet build IoTHub.Portal.sln --configuration Release
working-directory: src/

- name: Perform CodeQL Analysis
Expand Down
6 changes: 3 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ __pycache__/


src/.env
/src/AzureIoTHub.Portal/Client/Properties/launchSettings.json
/src/IoTHub.Portal/Client/Properties/launchSettings.json

# Jekyll
_site/
Expand Down Expand Up @@ -315,8 +315,8 @@ Temporary Items
*.icloud

# End of https://www.toptal.com/developers/gitignore/api/macos
src/AzureIoTHub.Portal/Client/assets/package-lock.json
src/AzureIoTHub.Portal/Server/appsettings.Development.json
src/IoTHub.Portal/Client/assets/package-lock.json
src/IoTHub.Portal/Server/appsettings.Development.json

# Folder for iotedge-lorawan-starterkit bicep templates
iotedge-lorawan-starterkit/
4 changes: 2 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"request": "launch",
"preLaunchTask": "build",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/src/AzureIoTHub.Portal.Server/bin/Debug/net7.0/AzureIoTHub.Portal.Server.dll",
"program": "${workspaceFolder}/src/IoTHub.Portal.Server/bin/Debug/net7.0/IoTHub.Portal.Server.dll",
"args": [],
"cwd": "${workspaceFolder}/src/AzureIoTHub.Portal.Server/",
"cwd": "${workspaceFolder}/src/IoTHub.Portal.Server/",
"stopAtEntry": false,
// Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
"serverReadyAction": {
Expand Down
6 changes: 3 additions & 3 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"type": "process",
"args": [
"build",
"${workspaceFolder}/src/AzureIoTHub.Portal.Server/AzureIoTHub.Portal.Server.csproj",
"${workspaceFolder}/src/IoTHub.Portal.Server/IoTHub.Portal.Server.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
Expand All @@ -19,7 +19,7 @@
"type": "process",
"args": [
"publish",
"${workspaceFolder}/src/AzureIoTHub.Portal.Server/AzureIoTHub.Portal.Server.csproj",
"${workspaceFolder}/src/IoTHub.Portal.Server/IoTHub.Portal.Server.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
Expand All @@ -33,7 +33,7 @@
"watch",
"run",
"--project",
"${workspaceFolder}/src/AzureIoTHub.Portal.Server/AzureIoTHub.Portal.Server.csproj"
"${workspaceFolder}/src/IoTHub.Portal.Server/IoTHub.Portal.Server.csproj"
],
"problemMatcher": "$msCompile"
}
Expand Down
10 changes: 5 additions & 5 deletions src/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@

[assembly: System.CLSCompliant(false)]

[assembly: InternalsVisibleTo("AzureIoTHub.Portal.Shared")]
[assembly: InternalsVisibleTo("AzureIoTHub.Portal.Infrastructure")]
[assembly: InternalsVisibleTo("AzureIoTHub.Portal.Server")]
[assembly: InternalsVisibleTo("AzureIoTHub.Portal.Client")]
[assembly: InternalsVisibleTo("AzureIoTHub.Portal.Tests.Unit")]
[assembly: InternalsVisibleTo("IoTHub.Portal.Shared")]
[assembly: InternalsVisibleTo("IoTHub.Portal.Infrastructure")]
[assembly: InternalsVisibleTo("IoTHub.Portal.Server")]
[assembly: InternalsVisibleTo("IoTHub.Portal.Client")]
[assembly: InternalsVisibleTo("IoTHub.Portal.Tests.Unit")]
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
32 changes: 0 additions & 32 deletions src/AzureIoTHub.Portal.Client/_Imports.razor

This file was deleted.

16 changes: 8 additions & 8 deletions src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,20 @@ FROM build AS builder
ARG BUILD_VERSION=1.2.3
ARG GITHUB_RUN_NUMBER=4
WORKDIR /src
COPY ["AzureIoTHub.Portal.Server/AzureIoTHub.Portal.Server.csproj", "AzureIoTHub.Portal.Server/"]
COPY ["AzureIoTHub.Portal.Shared/AzureIoTHub.Portal.Shared.csproj", "AzureIoTHub.Portal.Shared/"]
COPY ["AzureIoTHub.Portal.Client/AzureIoTHub.Portal.Client.csproj", "AzureIoTHub.Portal.Client/"]
RUN dotnet restore "AzureIoTHub.Portal.Server/AzureIoTHub.Portal.Server.csproj"
COPY ["IoTHub.Portal.Server/IoTHub.Portal.Server.csproj", "IoTHub.Portal.Server/"]
COPY ["IoTHub.Portal.Shared/IoTHub.Portal.Shared.csproj", "IoTHub.Portal.Shared/"]
COPY ["IoTHub.Portal.Client/IoTHub.Portal.Client.csproj", "IoTHub.Portal.Client/"]
RUN dotnet restore "IoTHub.Portal.Server/IoTHub.Portal.Server.csproj"
COPY . .
WORKDIR "/src/AzureIoTHub.Portal.Server"
RUN dotnet build "AzureIoTHub.Portal.Server.csproj" -c Release -o /app/build -p:Version="${BUILD_VERSION}.${GITHUB_RUN_NUMBER}" -p:ClientAssetsRestoreCommand="npm ci"
WORKDIR "/src/IoTHub.Portal.Server"
RUN dotnet build "IoTHub.Portal.Server.csproj" -c Release -o /app/build -p:Version="${BUILD_VERSION}.${GITHUB_RUN_NUMBER}" -p:ClientAssetsRestoreCommand="npm ci"

FROM builder AS publish
ARG BUILD_VERSION=1.2.3
ARG GITHUB_RUN_NUMBER=4
RUN dotnet publish "AzureIoTHub.Portal.Server.csproj" -c Release -o /app/publish -p:Version="${BUILD_VERSION}.${GITHUB_RUN_NUMBER}" -p:ClientAssetsRestoreCommand="npm ci"
RUN dotnet publish "IoTHub.Portal.Server.csproj" -c Release -o /app/publish -p:Version="${BUILD_VERSION}.${GITHUB_RUN_NUMBER}" -p:ClientAssetsRestoreCommand="npm ci"

FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "AzureIoTHub.Portal.Server.dll"]
ENTRYPOINT ["dotnet", "IoTHub.Portal.Server.dll"]
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) CGI France. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

namespace AzureIoTHub.Portal.Application.Helpers
namespace IoTHub.Portal.Application.Helpers
{
using System;
using Amazon.IotData.Model;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Copyright (c) CGI France. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

namespace AzureIoTHub.Portal.Application.Helpers
namespace IoTHub.Portal.Application.Helpers
{
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text.RegularExpressions;
using AzureIoTHub.Portal.Models.v10;
using AzureIoTHub.Portal.Shared.Models.v10;
using AzureIoTHub.Portal.Shared.Models.v10.IoTEdgeModule;
using IoTHub.Portal.Models.v10;
using IoTHub.Portal.Shared.Models.v10;
using IoTHub.Portal.Shared.Models.v10.IoTEdgeModule;
using Microsoft.Azure.Devices;
using Newtonsoft.Json.Linq;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
// Copyright (c) CGI France. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

namespace AzureIoTHub.Portal.Application.Helpers
namespace IoTHub.Portal.Application.Helpers
{
using System;
using System.Collections.Generic;
using System.Security.Cryptography;
using System.Text;
using AzureIoTHub.Portal.Crosscutting.Extensions;
using AzureIoTHub.Portal.Domain.Entities;
using AzureIoTHub.Portal.Models.v10;
using IoTHub.Portal.Crosscutting.Extensions;
using IoTHub.Portal.Domain.Entities;
using IoTHub.Portal.Models.v10;
using Microsoft.Azure.Devices.Provisioning.Service;
using Microsoft.Azure.Devices.Shared;
using Newtonsoft.Json;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\AzureIoTHub.Portal.Crosscutting\AzureIoTHub.Portal.Crosscutting.csproj" />
<ProjectReference Include="..\AzureIoTHub.Portal.Domain\AzureIoTHub.Portal.Domain.csproj" />
<ProjectReference Include="..\AzureIoTHub.Portal.Shared\AzureIoTHub.Portal.Shared.csproj" />
<ProjectReference Include="..\IoTHub.Portal.Crosscutting\IoTHub.Portal.Crosscutting.csproj" />
<ProjectReference Include="..\IoTHubIoTHub.Portal.Domain\IoTHub.Portal.Domain.csproj" />
<ProjectReference Include="..\IoTHub.Portal.Shared\IoTHub.Portal.Shared.csproj" />
</ItemGroup>

</Project>
29 changes: 29 additions & 0 deletions src/IoTHub.Portal.Application/IoTHub.Portal.Application.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<Project Sdk="Microsoft.NET.Sdk">

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

<ItemGroup>
<PackageReference Include="AutoMapper" Version="12.0.1" />
<PackageReference Include="AWSSDK.IoT" Version="3.7.107.5" />
<PackageReference Include="AWSSDK.IotData" Version="3.7.102.5" />
<PackageReference Include="Azure.Messaging.EventHubs" Version="5.8.1" />
<PackageReference Include="Microsoft.Azure.Devices" Version="1.38.2" />
<PackageReference Include="Microsoft.Azure.Devices.Provisioning.Service" Version="1.18.2" />
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.0" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="7.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\IoTHub.Portal.Crosscutting\IoTHub.Portal.Crosscutting.csproj" />
<ProjectReference Include="..\IoTHub.Portal.Domain\IoTHub.Portal.Domain.csproj" />
<ProjectReference Include="..\IoTHub.Portal.Shared\IoTHub.Portal.Shared.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) CGI France. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

namespace AzureIoTHub.Portal.Application.Managers
namespace IoTHub.Portal.Application.Managers
{
using System;
using System.IO;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// Copyright (c) CGI France. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

namespace AzureIoTHub.Portal.Application.Managers
namespace IoTHub.Portal.Application.Managers
{
using System.Collections.Generic;
using System.IO;
using System.Threading.Tasks;
using AzureIoTHub.Portal.Shared.Models.v10;
using IoTHub.Portal.Shared.Models.v10;

public interface IExportManager
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// Copyright (c) CGI France. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

namespace AzureIoTHub.Portal.Application.Mappers.AWS
namespace IoTHub.Portal.Application.Mappers.AWS
{
using System.Text;
using Amazon.IoT;
using Amazon.IoT.Model;
using Amazon.IotData.Model;
using AutoMapper;
using AzureIoTHub.Portal.Domain.Entities;
using IoTHub.Portal.Domain.Entities;
using Models.v10;
using Newtonsoft.Json;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// Copyright (c) CGI France. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

namespace AzureIoTHub.Portal.Application.Mappers
namespace IoTHub.Portal.Application.Mappers
{
using AutoMapper;
using AzureIoTHub.Portal.Application.Helpers;
using AzureIoTHub.Portal.Domain.Entities;
using IoTHub.Portal.Application.Helpers;
using IoTHub.Portal.Domain.Entities;
using Microsoft.Azure.Devices.Shared;
using Models.v10.LoRaWAN;
using Shared.Models.v1._0;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// Copyright (c) CGI France. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.

namespace AzureIoTHub.Portal.Application.Mappers
namespace IoTHub.Portal.Application.Mappers
{
using AutoMapper;
using AzureIoTHub.Portal.Domain.Entities;
using IoTHub.Portal.Domain.Entities;
using Models.v10.LoRaWAN;

public class DeviceModelCommandProfile : Profile
Expand Down
Loading

0 comments on commit 7fdb40c

Please sign in to comment.