Skip to content

Commit 2b15b22

Browse files
royalstream9prady9
royalstream
authored and
9prady9
committed
Examples/Helloworld/[lang]/src
1 parent d276a0f commit 2b15b22

File tree

6 files changed

+24
-22
lines changed

6 files changed

+24
-22
lines changed

‎.gitignore

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
Examples/HelloFSharp/obj/
2-
Examples/HelloCSharp/obj/
31
Wrapper/obj/
2+
Wrapper/bin/
43
AutoGenTool/bin/
54
AutoGenTool/obj/
6-
Examples/bin/
7-
Wrapper/bin/
5+
Examples/HelloWorld/CSharp/bin/
6+
Examples/HelloWorld/CSharp/obj/
7+
Examples/HelloWorld/FSharp/bin/
8+
Examples/HelloWorld/FSharp/obj/
9+

‎ArrayFire.sln

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
44
VisualStudioVersion = 14.0.23107.0
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloCSharp", "Examples\HelloCSharp\HelloCSharp.csproj", "{3DDF07D8-2260-47D5-ABCF-2BF7B2818FAC}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArrayFire", "Wrapper\ArrayFire.csproj", "{C5F2B49F-6E49-4F37-B8FC-A70C9A061108}"
77
EndProject
8-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "HelloFSharp", "Examples\HelloFSharp\HelloFSharp.fsproj", "{55144E61-0740-4116-8F43-A45F1A9909AB}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloWorld (CSharp)", "Examples\HelloWorld\CSharp\HelloWorld (CSharp).csproj", "{3DDF07D8-2260-47D5-ABCF-2BF7B2818FAC}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArrayFire", "Wrapper\ArrayFire.csproj", "{C5F2B49F-6E49-4F37-B8FC-A70C9A061108}"
10+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "HelloWorld (FSharp)", "Examples\HelloWorld\FSharp\HelloWorld (FSharp).fsproj", "{55144E61-0740-4116-8F43-A45F1A9909AB}"
1111
EndProject
1212
Global
1313
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1414
Debug|x64 = Debug|x64
1515
Release|x64 = Release|x64
1616
EndGlobalSection
1717
GlobalSection(ProjectConfigurationPlatforms) = postSolution
18+
{C5F2B49F-6E49-4F37-B8FC-A70C9A061108}.Debug|x64.ActiveCfg = Debug|x64
19+
{C5F2B49F-6E49-4F37-B8FC-A70C9A061108}.Debug|x64.Build.0 = Debug|x64
20+
{C5F2B49F-6E49-4F37-B8FC-A70C9A061108}.Release|x64.ActiveCfg = Release|x64
21+
{C5F2B49F-6E49-4F37-B8FC-A70C9A061108}.Release|x64.Build.0 = Release|x64
1822
{3DDF07D8-2260-47D5-ABCF-2BF7B2818FAC}.Debug|x64.ActiveCfg = Debug|x64
1923
{3DDF07D8-2260-47D5-ABCF-2BF7B2818FAC}.Debug|x64.Build.0 = Debug|x64
2024
{3DDF07D8-2260-47D5-ABCF-2BF7B2818FAC}.Release|x64.ActiveCfg = Release|x64
@@ -23,10 +27,6 @@ Global
2327
{55144E61-0740-4116-8F43-A45F1A9909AB}.Debug|x64.Build.0 = Debug|x64
2428
{55144E61-0740-4116-8F43-A45F1A9909AB}.Release|x64.ActiveCfg = Release|x64
2529
{55144E61-0740-4116-8F43-A45F1A9909AB}.Release|x64.Build.0 = Release|x64
26-
{C5F2B49F-6E49-4F37-B8FC-A70C9A061108}.Debug|x64.ActiveCfg = Debug|x64
27-
{C5F2B49F-6E49-4F37-B8FC-A70C9A061108}.Debug|x64.Build.0 = Debug|x64
28-
{C5F2B49F-6E49-4F37-B8FC-A70C9A061108}.Release|x64.ActiveCfg = Release|x64
29-
{C5F2B49F-6E49-4F37-B8FC-A70C9A061108}.Release|x64.Build.0 = Release|x64
3030
EndGlobalSection
3131
GlobalSection(SolutionProperties) = preSolution
3232
HideSolutionNode = FALSE

‎Examples/HelloCSharp/HelloCSharp.csproj renamed to ‎Examples/HelloWorld/CSharp/HelloWorld (CSharp).csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
<ProjectGuid>{3DDF07D8-2260-47D5-ABCF-2BF7B2818FAC}</ProjectGuid>
66
<OutputType>Exe</OutputType>
77
<AppDesignerFolder>Properties</AppDesignerFolder>
8-
<RootNamespace>HelloCSharp</RootNamespace>
9-
<AssemblyName>HelloCSharp</AssemblyName>
8+
<RootNamespace>HelloWorld.CSharp</RootNamespace>
9+
<AssemblyName>HelloWorld.CSharp</AssemblyName>
1010
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1111
<FileAlignment>512</FileAlignment>
1212
</PropertyGroup>
1313
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
1414
<DebugSymbols>true</DebugSymbols>
15-
<OutputPath>..\bin\Debug\</OutputPath>
15+
<OutputPath>bin\Debug\</OutputPath>
1616
<DefineConstants>DEBUG;TRACE</DefineConstants>
1717
<DebugType>full</DebugType>
1818
<PlatformTarget>x64</PlatformTarget>
@@ -21,7 +21,7 @@
2121
<Prefer32Bit>true</Prefer32Bit>
2222
</PropertyGroup>
2323
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
24-
<OutputPath>..\bin\Release\</OutputPath>
24+
<OutputPath>bin\Release\</OutputPath>
2525
<DefineConstants>TRACE</DefineConstants>
2626
<Optimize>true</Optimize>
2727
<DebugType>pdbonly</DebugType>
@@ -43,7 +43,7 @@
4343
<Folder Include="Properties\" />
4444
</ItemGroup>
4545
<ItemGroup>
46-
<ProjectReference Include="..\..\Wrapper\ArrayFire.csproj">
46+
<ProjectReference Include="..\..\..\Wrapper\ArrayFire.csproj">
4747
<Project>{c5f2b49f-6e49-4f37-b8fc-a70c9a061108}</Project>
4848
<Name>ArrayFire</Name>
4949
</ProjectReference>

‎Examples/HelloCSharp/Program.cs renamed to ‎Examples/HelloWorld/CSharp/Program.cs

File renamed without changes.

‎Examples/HelloFSharp/HelloFSharp.fsproj renamed to ‎Examples/HelloWorld/FSharp/HelloWorld (FSharp).fsproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
<SchemaVersion>2.0</SchemaVersion>
66
<ProjectGuid>55144e61-0740-4116-8f43-a45f1a9909ab</ProjectGuid>
77
<OutputType>Exe</OutputType>
8-
<RootNamespace>HelloFSharp</RootNamespace>
9-
<AssemblyName>HelloFSharp</AssemblyName>
8+
<RootNamespace>HelloWorld.FSharp</RootNamespace>
9+
<AssemblyName>HelloWorld.FSharp</AssemblyName>
1010
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1111
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1212
<TargetFSharpCoreVersion>4.4.0.0</TargetFSharpCoreVersion>
13-
<Name>HelloFSharp</Name>
13+
<Name>HelloWorld (FSharp)</Name>
1414
</PropertyGroup>
1515
<ItemGroup>
1616
<Reference Include="mscorlib" />
@@ -25,7 +25,7 @@
2525
<Compile Include="Program.fs" />
2626
</ItemGroup>
2727
<ItemGroup>
28-
<ProjectReference Include="..\..\Wrapper\ArrayFire.csproj">
28+
<ProjectReference Include="..\..\..\Wrapper\ArrayFire.csproj">
2929
<Name>ArrayFire</Name>
3030
<Project>{c5f2b49f-6e49-4f37-b8fc-a70c9a061108}</Project>
3131
<Private>True</Private>
@@ -39,7 +39,7 @@
3939
<DebugType>full</DebugType>
4040
<Optimize>false</Optimize>
4141
<Tailcalls>false</Tailcalls>
42-
<OutputPath>..\bin\Debug\</OutputPath>
42+
<OutputPath>bin\Debug\</OutputPath>
4343
<DefineConstants>DEBUG;TRACE</DefineConstants>
4444
<WarningLevel>3</WarningLevel>
4545
<DocumentationFile>
@@ -51,7 +51,7 @@
5151
<DebugType>pdbonly</DebugType>
5252
<Optimize>true</Optimize>
5353
<Tailcalls>true</Tailcalls>
54-
<OutputPath>..\bin\Release\</OutputPath>
54+
<OutputPath>bin\Release\</OutputPath>
5555
<DefineConstants>TRACE</DefineConstants>
5656
<WarningLevel>3</WarningLevel>
5757
<DocumentationFile>

‎Examples/HelloFSharp/Program.fs renamed to ‎Examples/HelloWorld/FSharp/Program.fs

File renamed without changes.

0 commit comments

Comments
 (0)