Skip to content

Commit eb4bb02

Browse files
tmilnthorpangularsen
authored andcommitted
Moving UnitsNet.WindowsRuntimeComponent project to its own top-level … (#453)
* Moving UnitsNet.WindowsRuntimeComponent project to its own top-level folder * Forgot to update nuspec paths
1 parent 4fb878e commit eb4bb02

File tree

6 files changed

+15
-9
lines changed

6 files changed

+15
-9
lines changed

Build/build-functions.psm1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ function Start-PackNugets {
8989
dotnet pack --configuration Release -o $nugetOutDir "$root\$projectPath"
9090
if ($lastexitcode -ne 0) { exit 1 }
9191
}
92-
write-host -foreground yellow "WindowsRuntimeComponent project not yet supported by dotnet CLI, using NuGex.exe instead"
93-
& $nuget pack "$root\UnitsNet\UnitsNet.WindowsRuntimeComponent.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir" -Symbols
92+
write-host -foreground yellow "WindowsRuntimeComponent project not yet supported by dotnet CLI, using nuget.exe instead"
93+
& $nuget pack "$root\UnitsNet.WindowsRuntimeComponent\UnitsNet.WindowsRuntimeComponent.nuspec" -Verbosity detailed -OutputDirectory "$nugetOutDir" -Symbols
9494

9595
write-host -foreground blue "Pack nugets...END`n"
9696
}

Build/set-version-UnitsNet.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ $root = Resolve-Path "$PSScriptRoot\.."
5252
$paramSet = $PsCmdlet.ParameterSetName
5353
$commonPropsFile = "$root\UnitsNet\UnitsNet.Common.props"
5454
$winrtAssemblyInfoFile = "$root\UnitsNet\Properties\AssemblyInfo.WindowsRuntimeComponent.cs"
55-
$winrtNuspecFile = "$root\UnitsNet\UnitsNet.WindowsRuntimeComponent.nuspec"
55+
$winrtNuspecFile = "$root\UnitsNet.WindowsRuntimeComponent\UnitsNet.WindowsRuntimeComponent.nuspec"
5656
$versionFiles = @($commonPropsFile, $winrtAssemblyInfoFile, $winrtNuspecFile)
5757
$projectName = "UnitsNet"
5858

@@ -62,4 +62,4 @@ $newVersion = Get-NewProjectVersion $commonPropsFile $paramSet $setVersion $bump
6262
Set-ProjectVersion $commonPropsFile $newVersion
6363
Set-AssemblyInfoVersion $winrtAssemblyInfoFile $newVersion
6464
Set-NuspecVersion $winrtNuspecFile $newVersion
65-
Invoke-CommitAndTagVersion $projectName $versionFiles $newVersion
65+
Invoke-CommitAndTagVersion $projectName $versionFiles $newVersion

UnitsNet.AllTargets.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitsNet.Serialization.Json
1515
EndProject
1616
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitsNet.Tests", "UnitsNet.Tests\UnitsNet.Tests.csproj", "{0E3B7567-5DF2-44BD-88DB-CCF050D3F943}"
1717
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitsNet.WindowsRuntimeComponent", "UnitsNet\UnitsNet.WindowsRuntimeComponent.csproj", "{2DA428CA-BFE1-43FA-86D2-7CB42289D596}"
18+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitsNet.WindowsRuntimeComponent", "UnitsNet.WindowsRuntimeComponent\UnitsNet.WindowsRuntimeComponent.csproj", "{2DA428CA-BFE1-43FA-86D2-7CB42289D596}"
1919
EndProject
2020
Global
2121
GlobalSection(SolutionConfigurationPlatforms) = preSolution

UnitsNet.WindowsRuntimeComponent.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 15
33
VisualStudioVersion = 15.0.27004.2002
44
MinimumVisualStudioVersion = 10.0.40219.1
5-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitsNet.WindowsRuntimeComponent", "UnitsNet\UnitsNet.WindowsRuntimeComponent.csproj", "{2DA428CA-BFE1-43FA-86D2-7CB42289D596}"
5+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitsNet.WindowsRuntimeComponent", "UnitsNet.WindowsRuntimeComponent\UnitsNet.WindowsRuntimeComponent.csproj", "{2DA428CA-BFE1-43FA-86D2-7CB42289D596}"
66
EndProject
77
Global
88
GlobalSection(SolutionConfigurationPlatforms) = preSolution

UnitsNet/UnitsNet.WindowsRuntimeComponent.csproj renamed to UnitsNet.WindowsRuntimeComponent/UnitsNet.WindowsRuntimeComponent.csproj

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,15 @@
9696
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
9797
</PropertyGroup>
9898
<ItemGroup>
99-
<Compile Include="**\*.cs;" Exclude="obj\**" />
100-
<None Include="Scripts\**\*.*" />
101-
<None Include="UnitDefinitions\**\*.*" />
99+
<Compile Include="..\UnitsNet\**\*.cs;" Exclude="**\AssemblyInfo.cs;**\obj\**">
100+
<Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
101+
</Compile>
102+
<None Include="..\UnitsNet\Scripts\**\*.*">
103+
<Link>Scripts\%(RecursiveDir)%(Filename)%(Extension)</Link>
104+
</None>
105+
<None Include="..\UnitsNet\UnitDefinitions\**\*.*">
106+
<Link>UnitDefinitions\%(RecursiveDir)%(Filename)%(Extension)</Link>
107+
</None>
102108
<None Include="UnitsNet.WindowsRuntimeComponent.nuspec" />
103109
</ItemGroup>
104110
<ItemGroup>
File renamed without changes.

0 commit comments

Comments
 (0)