Skip to content
This repository was archived by the owner on Jun 30, 2022. It is now read-only.

Commit 3ba2d2b

Browse files
authored
Refactor Libraries directories to SDK format (#2436)
* Rename /libs to /libraries to match SDK Rename libraries solution to Microsoft.Bot.Builder.Solutions Extract test projects to /tests directories * Fix .snk file references * Update to: \sdk \csharp \build \libraries \microsoft.bot.builder.skills \microsoft.bot.builder.solutions \tests \microsoft.bot.builder.skills.tests \microsoft.bot.builder.solutions.tests Microsoft.Bot.Builder.Solutions.sln * Rename microsoft.bot.builder.skills to microsoft.bot.builder.solutions.skills Refactor typescript libraries to follow \sdk \typescript \libraries \botbuilder-skills \botbuilder-solutions Move .ps1 files to \build and update references within Update yaml files with new references (csharp and typescript) Remove VirtualAssistant.ruleset at root * Updated npm pack references from \build\outputpackages directory * Fix reference to Skills project in solution Rename Skills test folder to Microsoft.Bot.Builder.Solutions.Skills.Tests * Match botbuilder.solutions.skills.yml to new directory * Remove .snk file from /build directory as it is duplicated in /sdk/csharp/build * Move \yaml as subdirectory under \build * Fix ref to microsoft.bot.builder.solutions.skills directory
1 parent 500f3a3 commit 3ba2d2b

File tree

352 files changed

+146
-156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

352 files changed

+146
-156
lines changed

VirtualAssistant.ruleset

Lines changed: 0 additions & 31 deletions
This file was deleted.

build.botbuilder-libs.ts.ps1 renamed to build/build.botbuilder-libs.ts.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if (-not $version) {
66
Write-Host "Version for botbuilder-libs required!. Please use the param -version" -ForegroundColor DarkRed
77
}
88

9-
pushd .\lib\typescript
9+
pushd ..\sdk\typescript\libraries
1010

1111
node .\common\scripts\install-run-rush.js install --no-link
1212

@@ -35,7 +35,7 @@ if (-not(test-path ".\outputpackages"))
3535

3636
pushd .\outputpackages
3737

38-
npm pack ..\lib\typescript\botbuilder-solutions
39-
npm pack ..\lib\typescript\botbuilder-skills
38+
npm pack ..\..\sdk\typescript\libraries\botbuilder-solutions
39+
npm pack ..\..\sdk\typescript\libraries\botbuilder-skills
4040

4141
popd

build.botskills.ts.ps1 renamed to build/build.botskills.ts.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if (-not $version) {
66
Write-Host "Version for botskills CLI tool required!. Please use the param -version" -ForegroundColor DarkRed
77
}
88

9-
pushd .\tools\botskills
9+
pushd ..\tools\botskills
1010

1111
npm install
1212
npm version $($version) --allow-same-version
@@ -21,6 +21,6 @@ if (-not(test-path ".\outputpackages"))
2121

2222
pushd .\outputpackages
2323

24-
npm pack ..\tools\botskills
24+
npm pack ..\..\tools\botskills
2525

2626
popd

build.generator-assistant.ts.ps1 renamed to build/build.generator-assistant.ts.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if (-not $version) {
66
Write-Host "Version for generator-botbuilder-assistant required!. Please use the param -version" -ForegroundColor DarkRed
77
}
88

9-
pushd .\templates\Virtual-Assistant-Template\typescript\generator-botbuilder-assistant
9+
pushd ..\templates\Virtual-Assistant-Template\typescript\generator-botbuilder-assistant
1010

1111
npm install
1212
npm version $($version) --allow-same-version
@@ -21,6 +21,6 @@ if (-not(test-path ".\outputpackages"))
2121

2222
pushd .\outputpackages
2323

24-
npm pack ..\templates\Virtual-Assistant-Template\typescript\generator-botbuilder-assistant
24+
npm pack ..\..\templates\Virtual-Assistant-Template\typescript\generator-botbuilder-assistant
2525

2626
popd
File renamed without changes.

yaml/csharp/botbuilder-solutions.yml renamed to build/yaml/csharp/botbuilder-skills.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ trigger:
44
include:
55
- master
66
- feature/*
7-
7+
88
paths:
99
include:
10-
- 'lib/csharp/microsoft.bot.builder.solutions/*'
10+
- 'sdk/csharp/libraries/microsoft.bot.builder.solutions.skills/*'
1111

1212
# By default will disable PR builds
1313
pr: none
@@ -37,12 +37,12 @@ steps:
3737
- task: NuGetCommand@2
3838
displayName: 'NuGet restore'
3939
inputs:
40-
restoreSolution: 'lib\csharp\Microsoft.Bot.Builder.Skills.sln'
40+
restoreSolution: 'sdk\csharp\Microsoft.Bot.Builder.Solutions.sln'
4141

4242
- task: VSBuild@1
43-
displayName: 'Build solution Microsoft.Bot.Builder.Skills.sln'
43+
displayName: 'Build solution Microsoft.Bot.Builder.Solutions.sln'
4444
inputs:
45-
solution: lib\csharp\Microsoft.Bot.Builder.Skills.sln
45+
solution: sdk\csharp\Microsoft.Bot.Builder.Solutions.sln
4646
vsVersion: '16.0'
4747
platform: '$(buildPlatform)'
4848
configuration: '$(buildConfiguration)'
@@ -51,13 +51,13 @@ steps:
5151
displayName: 'test results'
5252
inputs:
5353
command: test
54-
projects: '$(System.DefaultWorkingDirectory)\lib\csharp\microsoft.bot.builder.solutions\microsoft.bot.builder.solutions.tests\Microsoft.Bot.Builder.Solutions.Tests.csproj'
54+
projects: '$(System.DefaultWorkingDirectory)\sdk\csharp\tests\microsoft.bot.builder.solutions.skills.tests\Microsoft.Bot.Builder.Solutions.Skills.Tests.csproj'
5555
arguments: '-v n --configuration $(buildConfiguration) --no-build --no-restore --filter TestCategory!=IgnoreInAutomatedBuild /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura'
56-
workingDirectory: 'lib\csharp\microsoft.bot.builder.solutions\microsoft.bot.builder.solutions.tests'
56+
workingDirectory: 'sdk\csharp\tests\microsoft.bot.builder.solutions.skills.tests'
5757

5858
- task: PublishCodeCoverageResults@1
5959
displayName: 'Publish code coverage'
6060
inputs:
6161
codeCoverageTool: Cobertura
62-
summaryFileLocation: '$(Build.SourcesDirectory)\lib\csharp\microsoft.bot.builder.solutions\microsoft.bot.builder.solutions.tests\coverage.cobertura.xml'
63-
reportDirectory: '$(Build.SourcesDirectory)\lib\csharp\microsoft.bot.builder.solutions\microsoft.bot.builder.solutions.tests'
62+
summaryFileLocation: '$(Build.SourcesDirectory)\sdk\csharp\tests\microsoft.bot.builder.solutions.skills.tests\Microsoft.Bot.Builder.Solutions.Skills.Tests\coverage.cobertura.xml'
63+
reportDirectory: '$(Build.SourcesDirectory)\sdk\csharp\tests\microsoft.bot.builder.solutions.skills.tests'

yaml/csharp/botbuilder-skills.yml renamed to build/yaml/csharp/botbuilder-solutions.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ trigger:
44
include:
55
- master
66
- feature/*
7-
7+
88
paths:
99
include:
10-
- 'lib/csharp/microsoft.bot.builder.skills/*'
10+
- 'sdk/csharp/libraries/microsoft.bot.builder.solutions/*'
1111

1212
# By default will disable PR builds
1313
pr: none
@@ -37,12 +37,12 @@ steps:
3737
- task: NuGetCommand@2
3838
displayName: 'NuGet restore'
3939
inputs:
40-
restoreSolution: 'lib\csharp\Microsoft.Bot.Builder.Skills.sln'
40+
restoreSolution: 'sdk\csharp\Microsoft.Bot.Builder.Solutions.sln'
4141

4242
- task: VSBuild@1
43-
displayName: 'Build solution Microsoft.Bot.Builder.Skills.sln'
43+
displayName: 'Build solution Microsoft.Bot.Builder.Solutions.sln'
4444
inputs:
45-
solution: lib\csharp\Microsoft.Bot.Builder.Skills.sln
45+
solution: sdk\csharp\Microsoft.Bot.Builder.Solutions.sln
4646
vsVersion: '16.0'
4747
platform: '$(buildPlatform)'
4848
configuration: '$(buildConfiguration)'
@@ -51,13 +51,13 @@ steps:
5151
displayName: 'test results'
5252
inputs:
5353
command: test
54-
projects: '$(System.DefaultWorkingDirectory)\lib\csharp\microsoft.bot.builder.skills\Microsoft.Bot.Builder.Skills.Tests\Microsoft.Bot.Builder.Skills.Tests.csproj'
54+
projects: '$(System.DefaultWorkingDirectory)\sdk\csharp\tests\microsoft.bot.builder.solutions.tests\Microsoft.Bot.Builder.Solutions.Tests.csproj'
5555
arguments: '-v n --configuration $(buildConfiguration) --no-build --no-restore --filter TestCategory!=IgnoreInAutomatedBuild /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura'
56-
workingDirectory: 'lib\csharp\microsoft.bot.builder.skills\Microsoft.Bot.Builder.Skills.Tests'
56+
workingDirectory: 'sdk\csharp\tests\microsoft.bot.builder.solutions.tests'
5757

5858
- task: PublishCodeCoverageResults@1
5959
displayName: 'Publish code coverage'
6060
inputs:
6161
codeCoverageTool: Cobertura
62-
summaryFileLocation: '$(Build.SourcesDirectory)\lib\csharp\microsoft.bot.builder.skills\Microsoft.Bot.Builder.Skills.Tests\coverage.cobertura.xml'
63-
reportDirectory: '$(Build.SourcesDirectory)\lib\csharp\microsoft.bot.builder.skills\Microsoft.Bot.Builder.Skills.Tests'
62+
summaryFileLocation: '$(Build.SourcesDirectory)\sdk\csharp\tests\microsoft.bot.builder.solutions.tests\coverage.cobertura.xml'
63+
reportDirectory: '$(Build.SourcesDirectory)\sdk\csharp\tests\microsoft.bot.builder.solutions.tests'
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)