Skip to content

Commit 78db219

Browse files
josesimoesjosesimoes
committed
Work CD-CI
- Remove fody costure (doesn't perform as expected). - Rework nuspec and targets to deploy referenced assemblies in msbuild folder. Signed-off-by: José Simões <[email protected]>
1 parent 51d228d commit 78db219

File tree

6 files changed

+35
-130
lines changed

6 files changed

+35
-130
lines changed

‎source/MetadataProcessor.Core/FodyWeavers.xml‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎source/MetadataProcessor.Core/FodyWeavers.xsd‎

Lines changed: 0 additions & 111 deletions
This file was deleted.

‎source/MetadataProcessor.Core/MetadataProcessor.Core.csproj‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\Costura.Fody.3.3.3\build\Costura.Fody.props" Condition="Exists('..\packages\Costura.Fody.3.3.3\build\Costura.Fody.props')" />
43
<PropertyGroup>
54
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
65
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -40,9 +39,6 @@
4039
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
4140
</PropertyGroup>
4241
<ItemGroup>
43-
<Reference Include="Costura, Version=3.3.3.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
44-
<HintPath>..\packages\Costura.Fody.3.3.3\lib\net40\Costura.dll</HintPath>
45-
</Reference>
4642
<Reference Include="Microsoft.CSharp" />
4743
<Reference Include="Mono.Cecil, Version=0.11.1.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
4844
<HintPath>..\packages\Mono.Cecil.0.11.1\lib\net40\Mono.Cecil.dll</HintPath>
@@ -122,20 +118,12 @@
122118
<None Include="packages.config" />
123119
<Compile Include="SkeletonGenerator\SkeletonTemplates.cs" />
124120
</ItemGroup>
125-
<ItemGroup>
126-
<Content Include="FodyWeavers.xml">
127-
<SubType>Designer</SubType>
128-
</Content>
129-
</ItemGroup>
130121
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
131122
<Import Project="..\packages\Nerdbank.GitVersioning.3.0.28\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.0.28\build\Nerdbank.GitVersioning.targets')" />
132123
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
133124
<PropertyGroup>
134125
<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>
135126
</PropertyGroup>
136127
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.0.28\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.0.28\build\Nerdbank.GitVersioning.targets'))" />
137-
<Error Condition="!Exists('..\packages\Fody.4.0.2\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.4.0.2\build\Fody.targets'))" />
138-
<Error Condition="!Exists('..\packages\Costura.Fody.3.3.3\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.3.3.3\build\Costura.Fody.props'))" />
139128
</Target>
140-
<Import Project="..\packages\Fody.4.0.2\build\Fody.targets" Condition="Exists('..\packages\Fody.4.0.2\build\Fody.targets')" />
141129
</Project>

‎source/MetadataProcessor.Core/nanoFramework.Tools.MetaDataProcessor.targets‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,35 @@
66
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
77
<IncludeInVSIX>true</IncludeInVSIX>
88
</Content>
9+
<Content Include="$(MSBuildThisFileDirectory)Mono.Cecil.dll">
10+
<InstallRoot>MSBuild</InstallRoot>
11+
<VSIXSubPath>nanoFramework\v1.0\</VSIXSubPath>
12+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
13+
<IncludeInVSIX>true</IncludeInVSIX>
14+
</Content>
15+
<Content Include="$(MSBuildThisFileDirectory)Stubble.Core.dll">
16+
<InstallRoot>MSBuild</InstallRoot>
17+
<VSIXSubPath>nanoFramework\v1.0\</VSIXSubPath>
18+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
19+
<IncludeInVSIX>true</IncludeInVSIX>
20+
</Content>
21+
<Content Include="$(MSBuildThisFileDirectory)System.Collections.Immutable.dll">
22+
<InstallRoot>MSBuild</InstallRoot>
23+
<VSIXSubPath>nanoFramework\v1.0\</VSIXSubPath>
24+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
25+
<IncludeInVSIX>true</IncludeInVSIX>
26+
</Content>
27+
<Content Include="$(MSBuildThisFileDirectory)System.Runtime.CompilerServices.Unsafe.dll">
28+
<InstallRoot>MSBuild</InstallRoot>
29+
<VSIXSubPath>nanoFramework\v1.0\</VSIXSubPath>
30+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
31+
<IncludeInVSIX>true</IncludeInVSIX>
32+
</Content>
33+
<Content Include="$(MSBuildThisFileDirectory)System.Threading.Tasks.Extensions.dll">
34+
<InstallRoot>MSBuild</InstallRoot>
35+
<VSIXSubPath>nanoFramework\v1.0\</VSIXSubPath>
36+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
37+
<IncludeInVSIX>true</IncludeInVSIX>
38+
</Content>
939
</ItemGroup>
1040
</Project>

‎source/MetadataProcessor.Core/package.nuspec‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,12 @@
2828
</metadata>
2929
<files>
3030
<file src="bin\Release\nanoFramework.Tools.MetadataProcessor.Core.dll" target="lib/net461" />
31+
3132
<file src="bin\Release\nanoFramework.Tools.MetadataProcessor.Core.dll" target="build" />
33+
<file src="bin\Release\Stubble.Core.dll" target="build" />
34+
<file src="bin\Release\System.Collections.Immutable.dll" target="build" />
35+
<file src="bin\Release\System.Runtime.CompilerServices.Unsafe.dll" target="build" />
36+
<file src="bin\Release\System.Threading.Tasks.Extensions.dll" target="build" />
3237
<file src="nanoFramework.Tools.MetaDataProcessor.targets" target="build" />
3338
</files>
3439
</package>

‎source/MetadataProcessor.Core/packages.config‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Costura.Fody" version="3.3.3" targetFramework="net461" />
4-
<package id="Fody" version="4.0.2" targetFramework="net461" developmentDependency="true" />
53
<package id="Mono.Cecil" version="0.11.1" targetFramework="net461" />
64
<package id="Nerdbank.GitVersioning" version="3.0.28" targetFramework="net461" developmentDependency="true" />
75
<package id="Stubble.Core" version="1.6.3" targetFramework="net461" />

0 commit comments

Comments
 (0)