Skip to content

Commit 1b63a6f

Browse files
committed
Use nuget platform subfolders per project build output
Use wildcards in .nuspec to add all files with respective subfolders
1 parent a331acc commit 1b63a6f

File tree

4 files changed

+8
-11
lines changed

4 files changed

+8
-11
lines changed

Src/UnitsNet/UnitsNet.Portable40.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
<OutputType>Library</OutputType>
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>UnitsNet</RootNamespace>
12-
<AssemblyName>UnitsNet.Portable40</AssemblyName>
12+
<AssemblyName>UnitsNet</AssemblyName>
1313
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<TargetFrameworkProfile>Profile328</TargetFrameworkProfile>
1515
<FileAlignment>512</FileAlignment>
1616
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
17-
<OutputPath>..\..\Build\bin\$(Platform)_$(Configuration)\</OutputPath>
17+
<OutputPath>..\..\Build\Bin\$(Platform)_$(Configuration)\portable-net40+sl5+wp80+win8+wpa81\</OutputPath>
1818
<FileUpgradeFlags>
1919
</FileUpgradeFlags>
2020
<UpgradeBackupLocation>

Src/UnitsNet/UnitsNet.Portable45.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
<ProjectGuid>{72BC5ED7-7496-4048-9233-7A4A843FE8A2}</ProjectGuid>
99
<OutputType>Library</OutputType>
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
11-
<RootNamespace>UnitsNet.Portable45</RootNamespace>
12-
<AssemblyName>UnitsNet.Portable45</AssemblyName>
11+
<RootNamespace>UnitsNet</RootNamespace>
12+
<AssemblyName>UnitsNet</AssemblyName>
1313
<DefaultLanguage>en-US</DefaultLanguage>
1414
<FileAlignment>512</FileAlignment>
1515
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1616
<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
1717
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
18-
<OutputPath>..\..\Build\bin\$(Platform)_$(Configuration)\</OutputPath>
18+
<OutputPath>..\..\Build\Bin\$(Platform)_$(Configuration)\portable-net45+wp80+win8+wpa81\</OutputPath>
1919
</PropertyGroup>
2020
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2121
<DebugSymbols>true</DebugSymbols>

Src/UnitsNet/UnitsNet.net35.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@
88
<OutputType>Library</OutputType>
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>UnitsNet</RootNamespace>
11-
<AssemblyName>UnitsNet.net35</AssemblyName>
11+
<AssemblyName>UnitsNet</AssemblyName>
1212
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
15-
<OutputPath>..\..\Build\bin\$(Platform)_$(Configuration)\</OutputPath>
15+
<OutputPath>..\..\Build\bin\$(Platform)_$(Configuration)\net35\</OutputPath>
1616
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
1717
<RestorePackages>true</RestorePackages>
1818
</PropertyGroup>

UnitsNet.nuspec

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ Behind the scenes:
4242
<tags>unit units measurement si metric imperial abbreviation abbreviations convert conversion parse c# .net immutable</tags>
4343
</metadata>
4444
<files>
45-
<file src="Build\bin\AnyCPU_Release\UnitsNet.pcl.dll" target="lib\portable-net40+win+sl5+wp8\UnitsNet.pcl.dll" />
46-
<file src="Build\bin\AnyCPU_Release\UnitsNet.pcl.pdb" target="lib\portable-net40+win+sl5+wp8\UnitsNet.pcl.pdb" />
47-
<file src="Build\bin\AnyCPU_Release\UnitsNet.net35.dll" target="lib\net35-client\UnitsNet.net35.dll" />
48-
<file src="Build\bin\AnyCPU_Release\UnitsNet.net35.pdb" target="lib\net35-client\UnitsNet.net35.pdb" />
45+
<file src="Build\bin\AnyCPU_Release\**\UnitsNet.*" target="lib" />
4946
</files>
5047
</package>

0 commit comments

Comments
 (0)