Fix Folder Structure #1241

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.

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

Merged

Aniruddh25 merged 44 commits into main from dev/aaronburtle/fixFolderStructure

Feb 28, 2023

.pipelines/build-pipelines.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -145,14 +145,14 @@ steps:
  
      displayName: "Package DAB to multiple platforms"

      inputs:

        targetType: 'filePath'

        filePath: $(System.DefaultWorkingDirectory)/publish.ps1

        filePath: $(System.DefaultWorkingDirectory)/scripts/publish.ps1

        arguments: $(buildConfiguration) $(Build.ArtifactStagingDirectory) $(dabVersion) -Package

    - task: PowerShell@2

      displayName: "Smoke Test for DAB CLI"

      inputs:

        targetType: 'filePath'

        filePath: $(System.DefaultWorkingDirectory)/dab-smoke-test-script.ps1

        filePath: $(System.DefaultWorkingDirectory)/scripts/dab-smoke-test-script.ps1

        arguments: $(buildConfiguration) $(Build.ArtifactStagingDirectory) $(Agent.OS)  $(dabVersion)

    # Sign the binaries that were generated per platform

    @@ -165,7 +165,7 @@ steps:
  
      displayName: "Zip the binaries after signing"

      inputs:

        targetType: 'filePath'

        filePath: $(System.DefaultWorkingDirectory)/publish.ps1

        filePath: $(System.DefaultWorkingDirectory)/scripts/publish.ps1

        arguments: $(buildConfiguration) $(Build.ArtifactStagingDirectory) $(dabVersion) -CreateZip

    # Generating SBOM manifest for Dab files

    @@ -179,7 +179,7 @@ steps:
  
      displayName: "Generate Manifest File"

      inputs:

        targetType: 'filePath'

        filePath: $(System.DefaultWorkingDirectory)/create_manifest_file.ps1

        filePath: $(System.DefaultWorkingDirectory)/scripts/create-manifest-file.ps1

        arguments: $(buildConfiguration) $(Build.ArtifactStagingDirectory) $(dabVersion) $(isReleaseBuild)

    # This code takes all the files in $(Build.ArtifactStagingDirectory) and uploads them as an artifact of your build.

ConfigGenerators/configGenerator.ps1 → config-generators/config-generator.ps1

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -36,19 +36,19 @@ Set-Location $workingDirectory;
  
    #Generates the config files for the selected database types.

    foreach($databaseType in $databaseTypes){

        if($databaseType -eq "mssql"){

            $commandFile = "MsSqlCommands.txt";

            $commandFile = "mssql-commands.txt";

            $configFile = "dab-config.MsSql.json";

        }

        elseif($databaseType -eq "mysql"){

            $commandFile = "MySqlCommands.txt";

            $commandFile = "mysql-commands.txt";

            $configFile = "dab-config.MySql.json";

        }

        elseif($databaseType -eq "postgresql"){

            $commandFile = "PostgreSqlCommands.txt";

            $commandFile = "postgresql-commands.txt";

            $configFile = "dab-config.PostgreSql.json";

        }

        else{

            $commandFile = "CosmosCommands.txt";

            $commandFile = "cosmosdb_nosql-commands.txt";

            $configFile = "dab-config.CosmosDb_NoSql.json";

        }

ConfigGenerators/configGenerator.sh → config-generators/config-generator.sh

-Original file line number
+Diff line change
@@ Expand Up / @@ -39,16 +39,16 @@ cd $workingDirectory; @@
     for databaseType in ${databaseTypes[@]}
     do
         if [[ $databaseType == "mssql" ]]; then
-            commandFile="MsSqlCommands.txt";
+            commandFile="mssql-commands.txt";
             configFile="dab-config.MsSql.json";
         elif [[ $databaseType == "mysql" ]]; then
-            commandFile="MySqlCommands.txt";
+            commandFile="mysql-commands.txt";
             configFile="dab-config.MySql.json";
         elif [[ $databaseType == "postgresql" ]]; then
-            commandFile="PostgreSqlCommands.txt";
+            commandFile="postgresql-commands.txt";
             configFile="dab-config.PostgreSql.json";
         else
-            commandFile="CosmosCommands.txt";
+            commandFile="cosmosdb_nosql-commands.txt";
             configFile="dab-config.CosmosDb_NoSql.json";
         fi
@@ Expand Down @@

0 ConfigGenerators/CosmosCommands.txt → ...ig-generators/cosmosdb_nosql-commands.txt

File renamed without changes.

0 .../dab-config.cosmosdb_nosql.reference.json → .../dab-config.cosmosdb_nosql.reference.json

File renamed without changes.

0 ...enerators/dab-config.mssql.reference.json → ...enerators/dab-config.mssql.reference.json

File renamed without changes.

0 ...gGenerators/dab-config.sql.reference.json → ...-generators/dab-config.sql.reference.json

File renamed without changes.

0 ConfigGenerators/MsSqlCommands.txt → config-generators/mssql-commands.txt

File renamed without changes.

0 ConfigGenerators/MySqlCommands.txt → config-generators/mysql-commands.txt

File renamed without changes.

0 ConfigGenerators/PostgreSqlCommands.txt → config-generators/postgresql-commands.txt

File renamed without changes.

0 create_manifest_file.ps1 → scripts/create-manifest-file.ps1

File renamed without changes.

0 dab-smoke-test-script.ps1 → scripts/dab-smoke-test-script.ps1

File renamed without changes.

publish.ps1 → scripts/publish.ps1

-Original file line number
+Diff line change
@@ Expand Up / @@ -9,14 +9,14 @@ param ( @@
         [Parameter (Mandatory=$false)][switch] $CreateZip
     )
-    $BuildRoot = $PSScriptRoot
+    $BuildRoot = Split-Path $PSScriptRoot -Parent
     $RIDs = "win-x64", "linux-x64", "osx-x64"
     if ($Package)
     {
         foreach ($RID in $RIDs) {
-            $cmd = "dotnet publish --configuration $BuildConfiguration --output $BuildOutputDir/publish/$BuildConfiguration/$RID/dab --runtime $RID --self-contained true -p:Version=$DabVersion $BuildRoot/src/Cli/src/Cli.csproj"
+            $cmd = "dotnet publish --configuration $BuildConfiguration --output $BuildOutputDir/publish/$BuildConfiguration/$RID/dab --runtime $RID --self-contained true -p:Version=$DabVersion $BuildRoot/src/Cli/Cli.csproj"
             Write-Host $cmd
             Invoke-Expression $cmd
         }
@@ Expand Down @@

src/Azure.DataApiBuilder.sln

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -17,9 +17,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.DataApiBuilder.Servic
  
    EndProject

    Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.DataApiBuilder.Auth", "Auth\Azure.DataApiBuilder.Auth.csproj", "{249FF898-AD6E-46F2-B441-F6926BCD5179}"

    EndProject

    Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cli", "Cli\src\Cli.csproj", "{55528027-AC5E-4B3A-901A-BAE649C44C07}"

    Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cli", "Cli\Cli.csproj", "{55528027-AC5E-4B3A-901A-BAE649C44C07}"

    EndProject

    Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cli.Tests", "Cli\test\Cli.Tests.csproj", "{2D9D5A56-2025-43BA-97D6-47385C2890FE}"

    Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Cli.Tests", "Cli.Tests\Cli.Tests.csproj", "{2D9D5A56-2025-43BA-97D6-47385C2890FE}"

    EndProject

    Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{FBA18E2E-32A2-437C-AA5D-F9EF358874DC}"

    	ProjectSection(SolutionItems) = preProject

0 src/Cli/test/AddEntityTests.cs → src/Cli.Tests/AddEntityTests.cs

File renamed without changes.

src/Cli/test/Cli.Tests.csproj → src/Cli.Tests/Cli.Tests.csproj

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -5,7 +5,7 @@
  
            <ImplicitUsings>enable</ImplicitUsings>

            <Nullable>enable</Nullable>

            <IsPackable>false</IsPackable>

            <BaseOutputPath>..\..\out\tests</BaseOutputPath>

            <OutputPath>$(BaseOutputPath)\tests</OutputPath>

        </PropertyGroup>

        <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

    @@ -30,7 +30,7 @@
  
        </ItemGroup>

        <ItemGroup>

            <ProjectReference Include="..\src\Cli.csproj" />

            <ProjectReference Include="..\Cli\Cli.csproj" />

        </ItemGroup>

    </Project>

0 src/Cli/test/EndToEndTests.cs → src/Cli.Tests/EndToEndTests.cs

File renamed without changes.

0 src/Cli/test/InitTests.cs → src/Cli.Tests/InitTests.cs

File renamed without changes.

0 src/Cli/test/TestHelper.cs → src/Cli.Tests/TestHelper.cs

File renamed without changes.

0 src/Cli/test/UpdateEntityTests.cs → src/Cli.Tests/UpdateEntityTests.cs

File renamed without changes.

0 src/Cli/test/Usings.cs → src/Cli.Tests/Usings.cs

File renamed without changes.

0 src/Cli/test/UtilsTests.cs → src/Cli.Tests/UtilsTests.cs

File renamed without changes.

src/Cli/src/Cli.csproj → src/Cli/Cli.csproj

-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ @@
         <PackAsTool>true</PackAsTool>
         <ToolCommandName>dab</ToolCommandName>
         <PackageOutputPath>./nupkg</PackageOutputPath>
-        <BaseOutputPath>..\..\out\cli</BaseOutputPath>
+        <OutputPath>$(BaseOutputPath)\cli</OutputPath>
         <RuntimeIdentifiers>win-x64;linux-x64;osx-x64</RuntimeIdentifiers>
         <PackageId>Microsoft.DataApiBuilder</PackageId>
         <Title>Microsoft.DataApiBuilder</Title>
@@ Expand Down Expand Up / @@ -46,34 +46,34 @@ @@
       </ItemGroup>
       <ItemGroup>
-        <ProjectReference Include="..\..\Service\Azure.DataApiBuilder.Service.csproj" />
+        <ProjectReference Include="..\Service\Azure.DataApiBuilder.Service.csproj" />
       </ItemGroup>
       <ItemGroup>
-          <ConfigFiles Include="..\..\Service\dab-config*.json" />
+          <ConfigFiles Include="..\Service\dab-config*.json" />
       </ItemGroup>
       <ItemGroup>
         <None Remove="dab.draft.schema.json" />
       </ItemGroup>
       <ItemGroup>
-        <None Include="..\..\..\nuget\README.md" Pack="true" PackagePath="\" CopyToOutputDirectory="PreserveNewest" />
-        <None Include="..\..\..\nuget\nuget_icon.png" Pack="true" PackagePath="\" />
-        <None Include="..\..\..\LICENSE.txt" Pack="true" PackagePath="\" CopyToOutputDirectory="PreserveNewest" />
-        <None Include="..\..\..\NOTICE.txt" Pack="true" PackagePath="\" Condition="Exists('..\..\..\NOTICE.txt')" CopyToOutputDirectory="PreserveNewest" />
+        <None Include="..\..\nuget\README.md" Pack="true" PackagePath="\" CopyToOutputDirectory="PreserveNewest" />
+        <None Include="..\..\nuget\nuget_icon.png" Pack="true" PackagePath="\" />
+        <None Include="..\..\LICENSE.txt" Pack="true" PackagePath="\" CopyToOutputDirectory="PreserveNewest" />
+        <None Include="..\..\NOTICE.txt" Pack="true" PackagePath="\" Condition="Exists('..\..\..\NOTICE.txt')" CopyToOutputDirectory="PreserveNewest" />
       </ItemGroup>
       <ItemGroup>
-        <Content Include="..\..\..\schemas\dab.draft.schema.json">
+        <Content Include="..\..\schemas\dab.draft.schema.json">
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
       </ItemGroup>
       <Target Name="GenerateConfigFiles" AfterTargets="PostBuildEvent">
-          <Exec Command="powershell.exe -command ..\..\..\ConfigGenerators\configGenerator.ps1 $(generateConfigFileForDbType) " Condition=" '$(OS)' == 'Windows_NT' And '$(generateConfigFileForDbType)' != '' " />
-          <Exec Command="bash ../../../ConfigGenerators/configGenerator.sh $(generateConfigFileForDbType) " Condition=" '$(OS)' != 'Windows_NT' And '$(generateConfigFileForDbType)' != '' " />
-          <Copy SourceFiles="@(ConfigFiles)" DestinationFolder="..\..\out\tests\$(TargetFramework)" />
+          <Exec Command="powershell.exe -command ..\..\config-generators\config-generator.ps1 $(generateConfigFileForDbType) " Condition=" '$(OS)' == 'Windows_NT' And '$(generateConfigFileForDbType)' != '' " />
+          <Exec Command="bash ../../config-generators/config-generator.sh $(generateConfigFileForDbType) " Condition=" '$(OS)' != 'Windows_NT' And '$(generateConfigFileForDbType)' != '' " />
+          <Copy SourceFiles="@(ConfigFiles)" DestinationFolder="..\out\tests\$(TargetFramework)" />
       </Target>
     </Project>

0 src/Cli/src/CommandLineOptions.cs → src/Cli/CommandLineOptions.cs

File renamed without changes.

0 src/Cli/src/ConfigGenerator.cs → src/Cli/ConfigGenerator.cs

File renamed without changes.

0 src/Cli/src/CustomLoggerProvider.cs → src/Cli/CustomLoggerProvider.cs

File renamed without changes.

0 src/Cli/src/Program.cs → src/Cli/Program.cs

File renamed without changes.

0 src/Cli/src/Utils.cs → src/Cli/Utils.cs

File renamed without changes.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix Folder Structure #1241

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!