Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

fix: Fixed csproj reference in solution, and fixed folder include #3258

Merged
cwhitten merged 8 commits into from
Jun 3, 2020
Merged

fix: Fixed csproj reference in solution, and fixed folder include #3258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
55faa8c
Fixed csproj reference in solution, and fixed folder include
Jun 1, 2020
8a8ddfc
fix: Fixed csproj reference in solution, and fixed folder include
Jun 1, 2020
1b98df6
Merge branch 'bartbilliet-patch-1' of https://github.com/bartbilliet/…
Jun 1, 2020
3b08d32
Merge branch 'master' into bartbilliet-patch-1
zxyanliu Jun 2, 2020
ac65f32
Merge branch 'master' into bartbilliet-patch-1
bartbilliet Jun 2, 2020
3927c98
Merge branch 'master' into bartbilliet-patch-1
bartbilliet Jun 3, 2020
cf9d7b0
Merge branch 'master' into bartbilliet-patch-1
luhan2017 Jun 3, 2020
d0d628d
Merge branch 'master' into bartbilliet-patch-1
a-b-r-o-w-n Jun 3, 2020
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 runtime/dotnet/customaction/CustomAction.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30011.22
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "customaction", "customaction.csproj", "{2B5E9A3A-880D-4DEC-B76E-2AFDA3F05597}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "customaction", "Microsoft.BotFramework.Composer.CustomAction.csproj", "{2B5E9A3A-880D-4DEC-B76E-2AFDA3F05597}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
2 changes: 1 addition & 1 deletion runtime/dotnet/customaction/Microsoft.BotFramework.Composer.CustomAction.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<ItemGroup>
<Folder Include="Action\" />
<Folder Include="Schema\" />
<Folder Include="Schemas\" />
</ItemGroup>

<ItemGroup>
Expand Down