Skip to content

Commit 4ab98f7

Browse files
authored
Merge pull request #83 from Inumedia/pr/move_SlackAPI_subfolder
Moved SlackAPI project and files in SlackAPI subfolder
2 parents ffc8e8c + 8783026 commit 4ab98f7

File tree

142 files changed

+18
-58006
lines changed

Some content is hidden

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

142 files changed

+18
-58006
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System.Threading.Tasks;
88
using System.Web;
99

10-
namespace SlackApi
10+
namespace SlackAPI
1111
{
1212
class Program
1313
{
@@ -42,7 +42,7 @@ static void Main(string[] args)
4242
if (index != -1)
4343
asString = asString.Substring(index + 1);
4444

45-
// parse...
45+
// parse...
4646
var qs = HttpUtility.ParseQueryString(asString);
4747
var code = qs["code"];
4848
var newState = qs["state"];
@@ -53,7 +53,7 @@ static void Main(string[] args)
5353

5454
// then get the token...
5555
Console.WriteLine("Requesting access token...");
56-
SlackClient.GetAccessToken((response) =>
56+
SlackClient.GetAccessToken((response) =>
5757
{
5858
var accessToken = response.access_token;
5959
Console.WriteLine("Got access token '{0}'...", accessToken);

SlackApi.Console/Properties/AssemblyInfo.cs renamed to SlackAPI.Console/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
// General Information about an assembly is controlled through the following
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
8-
[assembly: AssemblyTitle("SlackApi.Console")]
8+
[assembly: AssemblyTitle("SlackAPI.Console")]
99
[assembly: AssemblyDescription("")]
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
12-
[assembly: AssemblyProduct("SlackApi.Console")]
12+
[assembly: AssemblyProduct("SlackAPI.Console")]
1313
[assembly: AssemblyCopyright("Copyright © 2015")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<ProjectGuid>{19140E48-E1A9-421D-86DB-5AF18EECFEF2}</ProjectGuid>
88
<OutputType>Exe</OutputType>
99
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>SlackApi.Console</RootNamespace>
11-
<AssemblyName>SlackApi.Console</AssemblyName>
10+
<RootNamespace>SlackAPI.Console</RootNamespace>
11+
<AssemblyName>SlackAPI.Console</AssemblyName>
1212
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
</PropertyGroup>
@@ -49,17 +49,17 @@
4949
<None Include="App.config" />
5050
</ItemGroup>
5151
<ItemGroup>
52-
<ProjectReference Include="..\SlackAPI.csproj">
52+
<ProjectReference Include="..\SlackAPI\SlackAPI.csproj">
5353
<Project>{0c0a58a8-174e-4a4c-907b-c3569144d15d}</Project>
5454
<Name>SlackAPI</Name>
5555
</ProjectReference>
5656
</ItemGroup>
5757
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
58-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
58+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
5959
Other similar extension points exist, see Microsoft.Common.targets.
6060
<Target Name="BeforeBuild">
6161
</Target>
6262
<Target Name="AfterBuild">
6363
</Target>
6464
-->
65-
</Project>
65+
</Project>

SlackAPI.Tests/SlackAPI.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
<Compile Include="Properties\AssemblyInfo.cs" />
7373
</ItemGroup>
7474
<ItemGroup>
75-
<ProjectReference Include="..\SlackAPI.csproj">
75+
<ProjectReference Include="..\SlackAPI\SlackAPI.csproj">
7676
<Project>{0c0a58a8-174e-4a4c-907b-c3569144d15d}</Project>
7777
<Name>SlackAPI</Name>
7878
</ProjectReference>

SlackAPI.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
</dependencies>
2020
</metadata>
2121
<files>
22-
<file src="bin\Release\SlackAPI.dll" target="lib\net45\SlackAPI.dll" />
23-
<file src="bin\Release\SlackAPI.pdb" target="lib\net45\SlackAPI.pdb" />
22+
<file src="SlackAPI\bin\Release\SlackAPI.dll" target="lib\net45\SlackAPI.dll" />
23+
<file src="SlackAPI\bin\Release\SlackAPI.pdb" target="lib\net45\SlackAPI.pdb" />
2424
</files>
2525
</package>

SlackAPI.sln

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
44
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SlackAPI", "SlackAPI.csproj", "{0C0A58A8-174E-4A4C-907B-C3569144D15D}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SlackAPI", "SlackAPI\SlackAPI.csproj", "{0C0A58A8-174E-4A4C-907B-C3569144D15D}"
77
EndProject
88
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SlackAPI.Tests", "SlackAPI.Tests\SlackAPI.Tests.csproj", "{C254F6FF-81D4-46DF-AA21-3D1A6456253B}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SlackApi.Console", "SlackApi.Console\SlackApi.Console.csproj", "{19140E48-E1A9-421D-86DB-5AF18EECFEF2}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SlackAPI.Console", "SlackAPI.Console\SlackAPI.Console.csproj", "{19140E48-E1A9-421D-86DB-5AF18EECFEF2}"
1111
EndProject
1212
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{9FC74E78-2D91-407E-B4C8-7C89D6CECB5B}"
1313
ProjectSection(SolutionItems) = preProject
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)