Skip to content

Commit

Permalink
Restructure repository per proposal in #79 (#95)
Browse files Browse the repository at this point in the history
* Restructure repository per proposal in #79. Resolves #79.

* Move external libs back out of src directory
  • Loading branch information
aseigler committed Jul 11, 2019
1 parent d2e5115 commit 4f2da32
Show file tree
Hide file tree
Showing 246 changed files with 11 additions and 11 deletions.
File renamed without changes.
2 changes: 1 addition & 1 deletion Fido2Demo/Fido2Demo.csproj → Demo/Demo.csproj
Expand Up @@ -16,6 +16,6 @@
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\fido2-net-lib\Fido2NetLib.csproj" />
<ProjectReference Include="..\Src\Fido2NetLib.csproj" />
</ItemGroup>
</Project>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion scripts/buildRelease.ps1 → Scripts/buildRelease.ps1
@@ -1,5 +1,5 @@
$scriptDir = Split-Path $myinvocation.mycommand.path -Parent
$root = Split-Path $scriptDir -Parent
$target = Join-Path $root "fido2-net-lib" | Join-Path -ChildPath "Fido2NetLib.csproj"
$target = Join-Path $root "Src" | Join-Path -ChildPath "Fido2NetLib.csproj"
Write-Host "Building $target"
dotnet build -c Release $target
2 changes: 1 addition & 1 deletion scripts/packRelase.ps1 → Scripts/packRelease.ps1
@@ -1,5 +1,5 @@
$scriptDir = Split-Path $myinvocation.mycommand.path -Parent
$root = Split-Path $scriptDir -Parent
$target = Join-Path $root "fido2-net-lib" | Join-Path -ChildPath "Fido2NetLib.csproj"
$target = Join-Path $root "Src" | Join-Path -ChildPath "Fido2NetLib.csproj"
Write-Host "Packing $target"
dotnet pack -c Release $target
2 changes: 1 addition & 1 deletion scripts/publish.ps1 → Scripts/publish.ps1
Expand Up @@ -2,7 +2,7 @@ param([String]$nupkgPath="") #Must be the first statement in your script

$scriptDir = Split-Path $myinvocation.mycommand.path -Parent
$root = Split-Path $scriptDir -Parent
$target = Join-Path $root "fido2-net-lib" | Join-Path -ChildPath "bin" | Join-Path -ChildPath "release"
$target = Join-Path $root "Src" | Join-Path -ChildPath "bin" | Join-Path -ChildPath "release"

if ($nupkgPath -eq "") {
Write-Error "No nupkg path supplied"
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions fido2-net-lib/Fido2NetLib.csproj → Src/Fido2NetLib.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../lib/CBOR/CBOR.Include.props" />
<Import Project="../lib/Chaos.NaCL/Chaos.NaCL.Include.props" />
<Import Project="../lib/Asn1Processor/Asn1Processor.Include.props" />
<Import Project="../ExternalLibs/CBOR/CBOR.Include.props" />
<Import Project="../ExternalLibs/Chaos.NaCL/Chaos.NaCL.Include.props" />
<Import Project="../ExternalLibs/Asn1Processor/Asn1Processor.Include.props" />

<PropertyGroup>
<TargetFrameworks>netstandard2.0;netcoreapp2.0</TargetFrameworks>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Expand Up @@ -22,7 +22,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\fido2-net-lib\Fido2NetLib.csproj" />
<ProjectReference Include="..\Src\Fido2NetLib.csproj" />
</ItemGroup>

</Project>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
6 changes: 3 additions & 3 deletions fido2-net-lib.sln
Expand Up @@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2024
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fido2NetLib", "fido2-net-lib\Fido2NetLib.csproj", "{671046B3-32C4-4430-A71F-27192EACECD0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Src", "Src\Fido2NetLib.csproj", "{671046B3-32C4-4430-A71F-27192EACECD0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Fido2Demo", "Fido2Demo\Fido2Demo.csproj", "{1A7DD7B0-255E-44AD-8BE0-5F833846F444}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Demo", "Demo\Demo.csproj", "{1A7DD7B0-255E-44AD-8BE0-5F833846F444}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "fido2-net-lib.Test", "fido2-net-lib.Test\fido2-net-lib.Test.csproj", "{06E82E3F-C626-4070-98BB-6D307DA86AC2}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test", "Test\Test.csproj", "{06E82E3F-C626-4070-98BB-6D307DA86AC2}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{80EE6A6B-EA6A-4C01-9EEA-45BE37DB5A2D}"
ProjectSection(SolutionItems) = preProject
Expand Down

0 comments on commit 4f2da32

Please sign in to comment.