Skip to content
This repository has been archived by the owner on Sep 18, 2021. It is now read-only.

Commit

Permalink
assembly/nuspec rename
Browse files Browse the repository at this point in the history
  • Loading branch information
leastprivilege committed Mar 29, 2015
1 parent 045174b commit cf2e85c
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
10 changes: 5 additions & 5 deletions default.ps1
Expand Up @@ -47,26 +47,26 @@ task UpdateVersion {
}

task RunTests -depends Compile {
$project = "Thinktecture.IdentityServer.Core.Tests"
$project = "IdentityServer3.Tests"
mkdir $output_directory\xunit\$project -ea SilentlyContinue
.$xunit_path "$src_directory\Tests\UnitTests\bin\Release\$project.dll"
}


task ILMerge -depends Compile {
$input_dlls = "$output_directory\Thinktecture.IdentityServer3.dll"
$input_dlls = "$output_directory\IdentityServer3.dll"

Get-ChildItem -Path $output_directory -Filter *.dll |
foreach-object {
# Exclude Thinktecture.IdentityServer3.dll as that will be the primary assembly
if ("$_" -ne "Thinktecture.IdentityServer3.dll" -and
if ("$_" -ne "IdentityServer3.dll" -and
"$_" -ne "Owin.dll") {
$input_dlls = "$input_dlls $output_directory\$_"
}
}

New-Item $dist_directory\lib\net45 -Type Directory
Invoke-Expression "$ilmerge_path /targetplatform:v4 /internalize /allowDup /target:library /out:$dist_directory\lib\net45\Thinktecture.IdentityServer3.dll $input_dlls"
Invoke-Expression "$ilmerge_path /targetplatform:v4 /internalize /allowDup /target:library /out:$dist_directory\lib\net45\IdentityServer3.dll $input_dlls"
}

task CreateNuGetPackage -depends ILMerge {
Expand All @@ -89,6 +89,6 @@ task CreateNuGetPackage -depends ILMerge {


copy-item $src_directory\IdentityServer3.nuspec $dist_directory
copy-item $output_directory\Thinktecture.IdentityServer3.xml $dist_directory\lib\net45\
copy-item $output_directory\IdentityServer3.xml $dist_directory\lib\net45\
exec { . $nuget_path pack $dist_directory\IdentityServer3.nuspec -BasePath $dist_directory -o $dist_directory -version $packageVersion }
}
6 changes: 3 additions & 3 deletions source/Core/Core.csproj
Expand Up @@ -8,7 +8,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Thinktecture.IdentityServer.Core</RootNamespace>
<AssemblyName>Thinktecture.IdentityServer3</AssemblyName>
<AssemblyName>IdentityServer3</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
Expand All @@ -21,7 +21,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>..\..\build\Thinktecture.IdentityServer3.xml</DocumentationFile>
<DocumentationFile>..\..\build\IdentityServer3.xml</DocumentationFile>
<NoWarn>
</NoWarn>
</PropertyGroup>
Expand All @@ -32,7 +32,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>..\..\build\Thinktecture.IdentityServer3.xml</DocumentationFile>
<DocumentationFile>..\..\build\IdentityServer3.xml</DocumentationFile>
<NoWarn>1591</NoWarn>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'AzureWebSites|AnyCPU'">
Expand Down
2 changes: 1 addition & 1 deletion source/Core/Properties/AssemblyInfo.cs
Expand Up @@ -37,4 +37,4 @@

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("8fd81f8c-9a47-479e-9a83-bdf66f883d78")]
[assembly: InternalsVisibleTo("Thinktecture.IdentityServer.Core.Tests")]
[assembly: InternalsVisibleTo("IdentityServer3.Tests")]
4 changes: 2 additions & 2 deletions source/IdentityServer3.nuspec
@@ -1,9 +1,9 @@
<?xml version="1.0"?>
<package >
<metadata>
<id>Thinktecture.IdentityServer3</id>
<id>IdentityServer3</id>
<version>0.0.0</version>
<title>Thinktecture IdentityServer3</title>
<title>IdentityServer3</title>
<authors>Brock Allen, Dominick Baier</authors>
<owners>Brock Allen, Dominick Baier</owners>
<projectUrl>https://github.com/IdentityServer/IdentityServer3</projectUrl>
Expand Down
2 changes: 1 addition & 1 deletion source/IdentityServer3.sln
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30723.0
VisualStudioVersion = 12.0.31101.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "Core\Core.csproj", "{FB9E026E-BAB3-498A-A954-B93B05C146A5}"
EndProject
Expand Down
2 changes: 1 addition & 1 deletion source/Tests/UnitTests/Core.Tests.csproj
Expand Up @@ -9,7 +9,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Thinktecture.IdentityServer.Tests</RootNamespace>
<AssemblyName>Thinktecture.IdentityServer.Core.Tests</AssemblyName>
<AssemblyName>IdentityServer3.Tests</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
Expand Down

0 comments on commit cf2e85c

Please sign in to comment.