Skip to content

Commit 90c550b

Browse files
AArnottAArnott
committed
Update and fix up NuGet packages
Fixes #73
2 parents 4cf0c80 + 6f241de commit 90c550b

24 files changed

Lines changed: 160 additions & 155 deletions

File tree

‎appveyor.yml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
version: 1.0.{build}
2+
os: Visual Studio 2015
3+
configuration: Release
4+
environment:
5+
VisualStudioVersion: 14.0
6+
DeployExtension: False
7+
NuGetApiKey:
8+
secure: Ql19CstT9GvFNeSIAjXvgHXZg+/pNaYJ2jVkzde4LT2vwSyjiQgQ+M332wVYtu+r
9+
cache:
10+
- '%USERPROFILE%\.nuget\packages -> **\project.json'
11+
install:
12+
- ps: >-
13+
iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/install-nuget-3-3-0.ps1'))
14+
15+
#$blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
16+
before_build:
17+
- ps: nuget restore src -Verbosity quiet
18+
build:
19+
project: src\ImmutableObjectGraph.sln
20+
parallel: true
21+
verbosity: minimal
22+
artifacts:
23+
- path: bin\**\*.nupkg
24+
name: NuGet Packages
25+
on_success:
26+
- ps: >-
27+
if ($env:NuGetApiKey -and $env:APPVEYOR_REPO_TAG_NAME -match "^v\d\.\d") {
28+
Write-Output "Publishing release packages to nuget.org due to pushed tag $env:APPVEYOR_REPO_TAG_NAME"
29+
Get-ChildItem bin\Release\PCLCrypto.NuGet\PCLCrypto.*.nupkg -exclude *.symbols.nupkg |% {
30+
nuget push $_ -ApiKey $env:NuGetApiKey
31+
}
32+
}

‎src/.RepoSrcRoot‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
This file is present to identity the src folder to the build.

‎src/ImmutableObjectGraph.Core.NuGet/ImmutableObjectGraph.Core.NuGet.nuproj‎

Lines changed: 7 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,9 @@
1111
</ProjectConfiguration>
1212
</ItemGroup>
1313
<PropertyGroup>
14-
<NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
15-
<NerdbankGitVersioningPackagePath>$(NuGetPackageRoot)\Nerdbank.GitVersioning\1.1.61-rc\</NerdbankGitVersioningPackagePath>
16-
<NuProjPackagePath>$(NuGetPackageRoot)\NuProj\0.10.30-beta-gcbd7693f91\</NuProjPackagePath>
17-
<NuProjPath>$(NuProjPackagePath)\tools</NuProjPath>
14+
<NuProjPath>$(UserProfile)\.nuget\packages\NuProj\0.10.48-beta-gea4a31bbc5\tools</NuProjPath>
15+
<NuSpecTemplate>ImmutableObjectGraph.nuspec</NuSpecTemplate>
1816
</PropertyGroup>
19-
<ImportGroup>
20-
<Import Project="$(NuGetPackageRoot)\ReadOnlySourceTree\0.1.24-beta\build\dotnet\ReadOnlySourceTree.props" Condition="Exists('$(NuGetPackageRoot)\ReadOnlySourceTree\0.1.24-beta\build\dotnet\ReadOnlySourceTree.props')" />
21-
</ImportGroup>
2217
<PropertyGroup Label="Globals">
2318
<ProjectGuid>bc4943cf-ca4c-4d24-96aa-7712061526e4</ProjectGuid>
2419
</PropertyGroup>
@@ -33,34 +28,17 @@
3328
<ReleaseNotes>
3429
</ReleaseNotes>
3530
<ProjectUrl>https://github.com/aarnott/immutableobjectgraph</ProjectUrl>
36-
<LicenseUrl>https://raw.githubusercontent.com/AArnott/ImmutableObjectGraph/$CommitId$/LICENSE.txt</LicenseUrl>
31+
<LicenseUrl>https://raw.githubusercontent.com/AArnott/ImmutableObjectGraph/$GitCommitIdShort$/LICENSE.txt</LicenseUrl>
3732
<Copyright>Copyright © Andrew Arnott</Copyright>
3833
<Tags>immutable </Tags>
39-
<VersionDependsOn>$(VersionDependsOn);GetNuPkgVersion</VersionDependsOn>
4034
<GenerateSymbolPackage>false</GenerateSymbolPackage>
4135
</PropertyGroup>
4236
<ItemGroup>
4337
<ProjectReference Include="..\ImmutableObjectGraph\ImmutableObjectGraph.csproj" />
4438
</ItemGroup>
39+
<ItemGroup>
40+
<None Include="project.json" />
41+
<None Include="ImmutableObjectGraph.nuspec" />
42+
</ItemGroup>
4543
<Import Project="$(NuProjPath)\NuProj.targets" />
46-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
47-
<PropertyGroup>
48-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
49-
</PropertyGroup>
50-
<Error Condition="!Exists('$(NerdbankGitVersioningPackagePath)build\NerdBank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NerdbankGitVersioningPackagePath)build\NerdBank.GitVersioning.targets'))" />
51-
</Target>
52-
<ImportGroup>
53-
<Import Project="$(NerdbankGitVersioningPackagePath)build\NerdBank.GitVersioning.targets" Condition="Exists('$(NerdbankGitVersioningPackagePath)build\NerdBank.GitVersioning.targets')" />
54-
<Import Project="$(NuGetPackageRoot)\ReadOnlySourceTree\0.1.24-beta\build\dotnet\ReadOnlySourceTree.targets" Condition="Exists('$(NuGetPackageRoot)\ReadOnlySourceTree\0.1.24-beta\build\dotnet\ReadOnlySourceTree.targets')" />
55-
</ImportGroup>
56-
<Target Name="GetNuPkgVersion" DependsOnTargets="GetBuildVersion">
57-
<PropertyGroup>
58-
<Version>$(NuGetPackageVersion)</Version>
59-
</PropertyGroup>
60-
</Target>
61-
<Target Name="PerformNuSpecSubstitutions" BeforeTargets="GenerateNuSpec" DependsOnTargets="GetBuildVersion">
62-
<PropertyGroup>
63-
<LicenseUrl>$(LicenseUrl.Replace('$CommitId$', $(GitCommitId)))</LicenseUrl>
64-
</PropertyGroup>
65-
</Target>
6644
</Project>

‎src/ImmutableObjectGraph.Core.NuGet/ImmutableObjectGraph.nuspec‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
3+
<metadata>
4+
<id>placeholder</id>
5+
<version>$version$</version>
6+
<authors>aarnott</authors>
7+
<owners></owners>
8+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
9+
<description>to be overwritten by project file</description>
10+
<releaseNotes></releaseNotes>
11+
<copyright></copyright>
12+
<tags></tags>
13+
<dependencies>
14+
<group targetFramework="portable-net45+win+wp80+MonoAndroid10+xamarinios10+MonoTouch10">
15+
<dependency id="System.Collections.Immutable" version="1.1.37" />
16+
<dependency id="Validation" version="2.2.8" />
17+
</group>
18+
</dependencies>
19+
</metadata>
20+
</package>

‎src/ImmutableObjectGraph.Core.NuGet/project.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"frameworks": {
3+
"net451": { }
4+
},
5+
"dependencies": {
6+
"Nerdbank.GitVersioning": "1.4.19",
7+
"NuProj": "0.10.48-beta-gea4a31bbc5",
8+
"ReadOnlySourceTree": "0.1.37-beta"
9+
},
10+
"runtimes": {
11+
"win": { }
12+
}
13+
}

‎src/ImmutableObjectGraph.Generation.Attributes/project.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"dependencies": {
3-
"CodeGeneration.Roslyn": "0.1.38-alpha-gf7a138c48e",
3+
"CodeGeneration.Roslyn": "0.1.54",
44
"Nerdbank.GitVersioning": {
5-
"version": "1.1.61-rc",
5+
"version": "1.4.19",
66
"suppressParent": "none"
77
},
88
"NuProj.Common": {
9-
"version": "0.10.30-beta-gcbd7693f91",
9+
"version": "0.10.48-beta-gea4a31bbc5",
1010
"suppressParent": "none"
1111
},
12-
"ReadOnlySourceTree": "0.1.24-beta",
12+
"ReadOnlySourceTree": "0.1.37-beta",
1313
"System.Collections.Immutable": "1.1.37",
1414
"Validation": "2.2.8"
1515
},

‎src/ImmutableObjectGraph.Generation.NuGet/ImmutableObjectGraph.Generation.NuGet.nuproj‎

Lines changed: 19 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,9 @@
1111
</ProjectConfiguration>
1212
</ItemGroup>
1313
<PropertyGroup>
14-
<NuGetPackageRoot>$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
15-
<NerdbankGitVersioningPackagePath>$(NuGetPackageRoot)\Nerdbank.GitVersioning\1.1.61-rc\</NerdbankGitVersioningPackagePath>
16-
<NuProjPackagePath>$(NuGetPackageRoot)\NuProj\0.10.30-beta-gcbd7693f91\</NuProjPackagePath>
17-
<NuProjPath>$(NuProjPackagePath)\tools</NuProjPath>
14+
<NuProjPath>$(UserProfile)\.nuget\packages\NuProj\0.10.48-beta-gea4a31bbc5\tools</NuProjPath>
15+
<NuSpecTemplate>ImmutableObjectGraph.Generation.nuspec</NuSpecTemplate>
1816
</PropertyGroup>
19-
<ImportGroup>
20-
<Import Project="$(NuGetPackageRoot)\ReadOnlySourceTree\0.1.24-beta\build\dotnet\ReadOnlySourceTree.props" Condition="Exists('$(NuGetPackageRoot)\ReadOnlySourceTree\0.1.24-beta\build\dotnet\ReadOnlySourceTree.props')" />
21-
</ImportGroup>
22-
<ItemGroup>
23-
<ProjectReference Include="..\ImmutableObjectGraph.Generation.Attributes\ImmutableObjectGraph.Generation.Attributes.csproj" />
24-
<ProjectReference Include="..\ImmutableObjectGraph.Generation\ImmutableObjectGraph.Generation.csproj" />
25-
<ProjectReference Include="..\ImmutableObjectGraph.Core.NuGet\ImmutableObjectGraph.Core.NuGet.nuproj" />
26-
</ItemGroup>
27-
<ItemGroup>
28-
<Content Include="build\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\ImmutableObjectGraph.Generation.targets" />
29-
<Content Include="Readme.txt" />
30-
</ItemGroup>
31-
<ItemGroup>
32-
<Dependency Include="CodeGeneration.Roslyn">
33-
<Version>0.1.38-alpha-gf7a138c48e</Version>
34-
<TargetFramework>.NETPortable0.0-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10</TargetFramework>
35-
</Dependency>
36-
<Dependency Include="CodeGeneration.Roslyn">
37-
<Version>0.1.38-alpha-gf7a138c48e</Version>
38-
<TargetFramework>net46</TargetFramework>
39-
</Dependency>
40-
</ItemGroup>
4117
<PropertyGroup Label="Globals">
4218
<ProjectGuid>C2529293-7A03-4E3A-B96A-59A6D70D3B86</ProjectGuid>
4319
</PropertyGroup>
@@ -52,28 +28,27 @@
5228
<ReleaseNotes>
5329
</ReleaseNotes>
5430
<ProjectUrl>https://github.com/aarnott/immutableobjectgraph</ProjectUrl>
55-
<LicenseUrl>https://raw.githubusercontent.com/AArnott/ImmutableObjectGraph/$CommitId$/LICENSE.txt</LicenseUrl>
31+
<LicenseUrl>https://raw.githubusercontent.com/AArnott/ImmutableObjectGraph/$GitCommitIdShort$/LICENSE.txt</LicenseUrl>
5632
<Copyright>Copyright © Andrew Arnott</Copyright>
5733
<Tags>immutable </Tags>
5834
<NoPackageAnalysis>true</NoPackageAnalysis>
59-
<VersionDependsOn>$(VersionDependsOn);GetNuPkgVersion</VersionDependsOn>
6035
<GenerateSymbolPackage>false</GenerateSymbolPackage>
36+
<DevelopmentDependency>true</DevelopmentDependency>
6137
</PropertyGroup>
38+
<ItemGroup>
39+
<ProjectReference Include="..\ImmutableObjectGraph.Generation.Attributes\ImmutableObjectGraph.Generation.Attributes.csproj" />
40+
<ProjectReference Include="..\ImmutableObjectGraph.Generation\ImmutableObjectGraph.Generation.csproj">
41+
<PackageDirectory>Tools</PackageDirectory>
42+
</ProjectReference>
43+
<ProjectReference Include="..\ImmutableObjectGraph.Core.NuGet\ImmutableObjectGraph.Core.NuGet.nuproj" />
44+
</ItemGroup>
45+
<ItemGroup>
46+
<Content Include="build\portable-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10\ImmutableObjectGraph.Generation.targets" />
47+
<Content Include="Readme.txt" />
48+
</ItemGroup>
49+
<ItemGroup>
50+
<None Include="ImmutableObjectGraph.Generation.nuspec" />
51+
<None Include="project.json" />
52+
</ItemGroup>
6253
<Import Project="$(NuProjPath)\NuProj.targets" />
63-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
64-
<PropertyGroup>
65-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
66-
</PropertyGroup>
67-
<Error Condition="!Exists('$(NerdbankGitVersioningPackagePath)build\NerdBank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NerdbankGitVersioningPackagePath)build\NerdBank.GitVersioning.targets'))" />
68-
</Target>
69-
<ImportGroup>
70-
<Import Project="$(NerdbankGitVersioningPackagePath)build\NerdBank.GitVersioning.targets" Condition="Exists('$(NerdbankGitVersioningPackagePath)build\NerdBank.GitVersioning.targets')" />
71-
<Import Project="$(NuGetPackageRoot)\ReadOnlySourceTree\0.1.24-beta\build\dotnet\ReadOnlySourceTree.targets" Condition="Exists('$(NuGetPackageRoot)\ReadOnlySourceTree\0.1.24-beta\build\dotnet\ReadOnlySourceTree.targets')" />
72-
</ImportGroup>
73-
<Target Name="GetNuPkgVersion" DependsOnTargets="GetBuildVersion">
74-
<PropertyGroup>
75-
<Version>$(NuGetPackageVersion)</Version>
76-
<NuSpecProperties>$(NuGetProperties);CommitId=$(GitCommitIdShort)</NuSpecProperties>
77-
</PropertyGroup>
78-
</Target>
7954
</Project>

‎src/ImmutableObjectGraph.Generation.NuGet/ImmutableObjectGraph.Generation.nuspec‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
3+
<metadata>
4+
<id>placeholder</id>
5+
<version>$version$</version>
6+
<authors>aarnott</authors>
7+
<owners></owners>
8+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
9+
<description>to be overwritten by project file</description>
10+
<releaseNotes></releaseNotes>
11+
<copyright></copyright>
12+
<tags></tags>
13+
<dependencies>
14+
<group targetFramework=".NETPortable0.0-net45+win+wpa81+wp80+MonoAndroid10+xamarinios10+MonoTouch10">
15+
<dependency id="CodeGeneration.Roslyn" version="0.1.54" />
16+
</group>
17+
</dependencies>
18+
</metadata>
19+
</package>

‎src/ImmutableObjectGraph.Generation.NuGet/Readme.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
1. Add the [GenerateImmutable] attribute on classes that define the readonly fields of an immutable type.
77

8-
using ImmutableObjectGraph.CodeGeneration;
8+
using ImmutableObjectGraph.Generation;
99

1010
[GenerateImmutable]
1111
partial class Person

‎src/ImmutableObjectGraph.Generation.NuGet/project.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"frameworks": {
3+
"net451": { }
4+
},
5+
"dependencies": {
6+
"Nerdbank.GitVersioning": "1.4.19",
7+
"NuProj": "0.10.48-beta-gea4a31bbc5",
8+
"ReadOnlySourceTree": "0.1.37-beta"
9+
},
10+
"runtimes": {
11+
"win": { }
12+
}
13+
}

0 commit comments

Comments
 (0)