Skip to content

Commit 4402f0a

Browse files
josesimoesjosesimoes
committed
Work CD-CI
- Remove NBGV from console app. - Update NuGet of NBGV. - Remove fody and costura from console app. - Bump version to 2.5. Signed-off-by: José Simões <[email protected]>
1 parent 84a384b commit 4402f0a

File tree

8 files changed

+6
-142
lines changed

8 files changed

+6
-142
lines changed

‎source/MetadataProcessor.Console/FodyWeavers.xml‎

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

‎source/MetadataProcessor.Console/FodyWeavers.xsd‎

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

‎source/MetadataProcessor.Console/MetadataProcessor.Console.csproj‎

Lines changed: 0 additions & 19 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>
@@ -32,9 +31,6 @@
3231
<Externalconsole>true</Externalconsole>
3332
</PropertyGroup>
3433
<ItemGroup>
35-
<Reference Include="Costura, Version=3.3.3.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
36-
<HintPath>..\packages\Costura.Fody.3.3.3\lib\net40\Costura.dll</HintPath>
37-
</Reference>
3834
<Reference Include="Microsoft.CSharp" />
3935
<Reference Include="Mono.Cecil, Version=0.11.1.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
4036
<HintPath>..\packages\Mono.Cecil.0.11.1\lib\net40\Mono.Cecil.dll</HintPath>
@@ -60,25 +56,10 @@
6056
<None Include="app.config" />
6157
<None Include="packages.config" />
6258
</ItemGroup>
63-
<ItemGroup>
64-
<Content Include="FodyWeavers.xml">
65-
<SubType>Designer</SubType>
66-
</Content>
67-
</ItemGroup>
6859
<ItemGroup>
6960
<ProjectReference Include="..\MetadataProcessor.Core\MetadataProcessor.Core.csproj">
7061
<Project>{e32f7d15-2499-440c-8026-4d5ee1c5ec3a}</Project>
7162
<Name>MetadataProcessor.Core</Name>
7263
</ProjectReference>
7364
</ItemGroup>
74-
<Import Project="..\packages\Nerdbank.GitVersioning.3.0.28\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.0.28\build\Nerdbank.GitVersioning.targets')" />
75-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
76-
<PropertyGroup>
77-
<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>
78-
</PropertyGroup>
79-
<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'))" />
80-
<Error Condition="!Exists('..\packages\Fody.4.0.2\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.4.0.2\build\Fody.targets'))" />
81-
<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'))" />
82-
</Target>
83-
<Import Project="..\packages\Fody.4.0.2\build\Fody.targets" Condition="Exists('..\packages\Fody.4.0.2\build\Fody.targets')" />
8465
</Project>

‎source/MetadataProcessor.Console/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,5 @@
1010
[assembly: AssemblyCompany("nanoFramework project contributors")]
1111
[assembly: AssemblyProduct("")]
1212
[assembly: AssemblyCopyright("Copyright (c) 2019 The nanoFramework project contributors")]
13+
[assembly: AssemblyVersion("1.0")]
14+
[assembly: AssemblyFileVersion("1.0")]

‎source/MetadataProcessor.Console/packages.config‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
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" />
6-
<package id="Nerdbank.GitVersioning" version="3.0.28" targetFramework="net461" developmentDependency="true" />
74
</packages>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,11 @@
130130
<Compile Include="SkeletonGenerator\SkeletonTemplates.cs" />
131131
</ItemGroup>
132132
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
133-
<Import Project="..\packages\Nerdbank.GitVersioning.3.0.28\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.0.28\build\Nerdbank.GitVersioning.targets')" />
133+
<Import Project="..\packages\Nerdbank.GitVersioning.3.0.50\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\packages\Nerdbank.GitVersioning.3.0.50\build\Nerdbank.GitVersioning.targets')" />
134134
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
135135
<PropertyGroup>
136136
<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>
137137
</PropertyGroup>
138-
<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'))" />
138+
<Error Condition="!Exists('..\packages\Nerdbank.GitVersioning.3.0.50\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Nerdbank.GitVersioning.3.0.50\build\Nerdbank.GitVersioning.targets'))" />
139139
</Target>
140140
</Project>

‎source/MetadataProcessor.Core/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Mono.Cecil" version="0.11.1" targetFramework="net461" />
4-
<package id="Nerdbank.GitVersioning" version="3.0.28" targetFramework="net461" developmentDependency="true" />
4+
<package id="Nerdbank.GitVersioning" version="3.0.50" targetFramework="net461" developmentDependency="true" />
55
<package id="Stubble.Core" version="1.7.2" targetFramework="net461" />
66
<package id="System.Buffers" version="4.5.0" targetFramework="net461" />
77
<package id="System.Collections.Immutable" version="1.7.0" targetFramework="net461" />

‎source/version.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "2.4",
3+
"version": "2.5",
44
"assemblyVersion": {
55
"precision": "revision"
66
},

0 commit comments

Comments
 (0)