Skip to content

Commit 914112c

Browse files
josesimoesjosesimoes
committed
Fix nupkg generation
- Add missing project properties. - Add refs to Microsoft.SourceLink libs.
1 parent 097303d commit 914112c

3 files changed

Lines changed: 36 additions & 4 deletions

File tree

‎nanoFramework.System.Threading/nanoFramework.System.Threading.nfproj‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="Current" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="..\packages\Nerdbank.GitVersioning.3.10.94\build\Nerdbank.GitVersioning.props" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.10.94\build\Nerdbank.GitVersioning.props')" />
4-
<Import Project="..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" />
5-
<Import Project="..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />
6-
<Import Project="..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />
4+
<Import Project="..\packages\Microsoft.Build.Tasks.Git.10.0.300\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\packages\Microsoft.Build.Tasks.Git.10.0.300\build\Microsoft.Build.Tasks.Git.props')" />
5+
<Import Project="..\packages\Microsoft.SourceLink.GitHub.10.0.300\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\packages\Microsoft.SourceLink.GitHub.10.0.300\build\Microsoft.SourceLink.GitHub.props')" />
6+
<Import Project="..\packages\Microsoft.SourceLink.Common.10.0.300\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\packages\Microsoft.SourceLink.Common.10.0.300\build\Microsoft.SourceLink.Common.props')" />
77
<PropertyGroup Label="Globals">
88
<NanoFrameworkProjectSystemPath>$(MSBuildExtensionsPath)\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
99
</PropertyGroup>
@@ -21,12 +21,14 @@
2121
<TargetFrameworkVersion>v1.0</TargetFrameworkVersion>
2222
<NF_IsCoreLibrary>True</NF_IsCoreLibrary>
2323
<DocumentationFile>bin\$(Configuration)\System.Threading.xml</DocumentationFile>
24+
<DebugSymbols>true</DebugSymbols>
25+
<DebugType>portable</DebugType>
2426
<Deterministic>true</Deterministic>
2527
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2628
<PublishRepositoryUrl>true</PublishRepositoryUrl>
27-
<Deterministic>true</Deterministic>
2829
<IncludeSymbols>true</IncludeSymbols>
2930
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
31+
<LangVersion>13.0</LangVersion>
3032
<ContinuousIntegrationBuild Condition="'$(TF_BUILD)' == 'true'">True</ContinuousIntegrationBuild>
3133
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
3234
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
@@ -82,8 +84,17 @@
8284
<PropertyGroup>
8385
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
8486
</PropertyGroup>
87+
<Error Condition="!Exists('..\packages\Microsoft.Build.Tasks.Git.10.0.300\build\Microsoft.Build.Tasks.Git.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Build.Tasks.Git.10.0.300\build\Microsoft.Build.Tasks.Git.targets'))" />
88+
<Error Condition="!Exists('..\packages\Microsoft.SourceLink.Common.10.0.300\build\Microsoft.SourceLink.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.SourceLink.Common.10.0.300\build\Microsoft.SourceLink.Common.props'))" />
89+
<Error Condition="!Exists('..\packages\Microsoft.SourceLink.Common.10.0.300\build\Microsoft.SourceLink.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.SourceLink.Common.10.0.300\build\Microsoft.SourceLink.Common.targets'))" />
90+
<Error Condition="!Exists('..\packages\Microsoft.SourceLink.GitHub.10.0.300\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.SourceLink.GitHub.10.0.300\build\Microsoft.SourceLink.GitHub.props'))" />
91+
<Error Condition="!Exists('..\packages\Microsoft.SourceLink.GitHub.10.0.300\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.SourceLink.GitHub.10.0.300\build\Microsoft.SourceLink.GitHub.targets'))" />
92+
<Error Condition="!Exists('..\packages\Microsoft.Build.Tasks.Git.10.0.300\build\Microsoft.Build.Tasks.Git.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Build.Tasks.Git.10.0.300\build\Microsoft.Build.Tasks.Git.props'))" />
8593
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.10.94\build\Nerdbank.GitVersioning.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.10.94\build\Nerdbank.GitVersioning.props'))" />
8694
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.10.94\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.10.94\build\Nerdbank.GitVersioning.targets'))" />
8795
</Target>
8896
<Import Project="..\packages\Nerdbank.GitVersioning.3.10.94\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.10.94\build\Nerdbank.GitVersioning.targets')" />
97+
<Import Project="..\packages\Microsoft.Build.Tasks.Git.10.0.300\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('..\packages\Microsoft.Build.Tasks.Git.10.0.300\build\Microsoft.Build.Tasks.Git.targets')" />
98+
<Import Project="..\packages\Microsoft.SourceLink.Common.10.0.300\build\Microsoft.SourceLink.Common.targets" Condition="Exists('..\packages\Microsoft.SourceLink.Common.10.0.300\build\Microsoft.SourceLink.Common.targets')" />
99+
<Import Project="..\packages\Microsoft.SourceLink.GitHub.10.0.300\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('..\packages\Microsoft.SourceLink.GitHub.10.0.300\build\Microsoft.SourceLink.GitHub.targets')" />
89100
</Project>

‎nanoFramework.System.Threading/packages.config‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3+
<package id="Microsoft.Build.Tasks.Git" version="10.0.300" targetFramework="netnano1.0" developmentDependency="true" />
4+
<package id="Microsoft.SourceLink.Common" version="10.0.300" targetFramework="netnano1.0" developmentDependency="true" />
5+
<package id="Microsoft.SourceLink.GitHub" version="10.0.300" targetFramework="netnano1.0" developmentDependency="true" />
36
<package id="nanoFramework.CoreLibrary" version="2.0.0-preview.63" targetFramework="netnano1.0" />
47
<package id="Nerdbank.GitVersioning" version="3.10.94" developmentDependency="true" targetFramework="netnano1.0" />
58
</packages>

‎nanoFramework.System.Threading/packages.lock.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,24 @@
22
"version": 1,
33
"dependencies": {
44
".NETnanoFramework,Version=v1.0": {
5+
"Microsoft.Build.Tasks.Git": {
6+
"type": "Direct",
7+
"requested": "[10.0.300, 10.0.300]",
8+
"resolved": "10.0.300",
9+
"contentHash": "P0kaQwVZx4xIUe2FtrLyBadYNXuAljttJUPvjBYRuHhPE8L77L42KakLDkaADRiUrGspoLcMwayjrbQhYTr0zA=="
10+
},
11+
"Microsoft.SourceLink.Common": {
12+
"type": "Direct",
13+
"requested": "[10.0.300, 10.0.300]",
14+
"resolved": "10.0.300",
15+
"contentHash": "0jlkXaUGjYlWTIVPve5MftjKHnT3SlAtq9BCLV4J9IjdPrxV/+4rMlBSjfr1khG8/GC6KGojjola8E1VvWF0qQ=="
16+
},
17+
"Microsoft.SourceLink.GitHub": {
18+
"type": "Direct",
19+
"requested": "[10.0.300, 10.0.300]",
20+
"resolved": "10.0.300",
21+
"contentHash": "QzCtLkXVb3l4IxcpvJCbzUwMLihAmLN6vVLjQGSzYSF8d2dvXxqJAZk83RV3gYnp2egz8jRMgSR2woY3vOahTA=="
22+
},
523
"nanoFramework.CoreLibrary": {
624
"type": "Direct",
725
"requested": "[2.0.0-preview.63, 2.0.0-preview.63]",

0 commit comments

Comments
 (0)