Skip to content

Commit 28ce5a3

Browse files
RinsenRinsen
committed
Updated projects to NETMF 4.3
1 parent 2a33a19 commit 28ce5a3

4 files changed

Lines changed: 210 additions & 207 deletions

File tree

‎MFUnit.Tests/MFUnit.Tests.csproj‎

Lines changed: 61 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,62 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<AssemblyName>MFUnit.Tests</AssemblyName>
5-
<OutputType>Exe</OutputType>
6-
<RootNamespace>MFUnit.Tests</RootNamespace>
7-
<ProjectTypeGuids>{b69e3092-b931-443c-abe7-7e7b65f2a37f};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
8-
<ProductVersion>9.0.21022</ProductVersion>
9-
<SchemaVersion>2.0</SchemaVersion>
10-
<ProjectGuid>{4E722DBA-63DF-4062-8A69-F32E33EA921F}</ProjectGuid>
11-
<TargetFrameworkVersion>v4.1</TargetFrameworkVersion>
12-
<NetMfTargetsBaseDir Condition="'$(NetMfTargetsBaseDir)'==''">$(MSBuildExtensionsPath32)\Microsoft\.NET Micro Framework\</NetMfTargetsBaseDir>
13-
</PropertyGroup>
14-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
15-
<DebugSymbols>true</DebugSymbols>
16-
<DebugType>full</DebugType>
17-
<Optimize>false</Optimize>
18-
<OutputPath>bin\Debug\</OutputPath>
19-
<DefineConstants>DEBUG;TRACE</DefineConstants>
20-
<ErrorReport>prompt</ErrorReport>
21-
<WarningLevel>4</WarningLevel>
22-
</PropertyGroup>
23-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
24-
<DebugType>pdbonly</DebugType>
25-
<Optimize>true</Optimize>
26-
<OutputPath>bin\Release\</OutputPath>
27-
<DefineConstants>TRACE</DefineConstants>
28-
<ErrorReport>prompt</ErrorReport>
29-
<WarningLevel>4</WarningLevel>
30-
</PropertyGroup>
31-
<Import Project="$(NetMfTargetsBaseDir)$(TargetFrameworkVersion)\CSharp.Targets" />
32-
<ItemGroup>
33-
<Compile Include="AssertTests.cs" />
34-
<Compile Include="Program.cs" />
35-
<Compile Include="Properties\AssemblyInfo.cs" />
36-
<Compile Include="Resources.Designer.cs">
37-
<AutoGen>True</AutoGen>
38-
<DesignTime>True</DesignTime>
39-
<DependentUpon>Resources.resx</DependentUpon>
40-
</Compile>
41-
</ItemGroup>
42-
<ItemGroup>
43-
<Reference Include="Microsoft.SPOT.Native">
44-
</Reference>
45-
<Reference Include="Microsoft.SPOT.TinyCore" />
46-
</ItemGroup>
47-
<ItemGroup>
48-
<EmbeddedResource Include="Resources.resx">
49-
<SubType>Designer</SubType>
50-
<Generator>ResXFileCodeGenerator</Generator>
51-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
52-
</EmbeddedResource>
53-
</ItemGroup>
54-
<ItemGroup>
55-
<ProjectReference Include="..\MFUnit\MFUnit.csproj">
56-
<Project>{EC81132A-FCC6-4294-B60E-B62E4A908C43}</Project>
57-
<Name>MFUnit</Name>
58-
</ProjectReference>
59-
</ItemGroup>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<AssemblyName>MFUnit.Tests</AssemblyName>
5+
<OutputType>Exe</OutputType>
6+
<RootNamespace>MFUnit.Tests</RootNamespace>
7+
<ProjectTypeGuids>{b69e3092-b931-443c-abe7-7e7b65f2a37f};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
8+
<ProductVersion>9.0.21022</ProductVersion>
9+
<SchemaVersion>2.0</SchemaVersion>
10+
<ProjectGuid>{4E722DBA-63DF-4062-8A69-F32E33EA921F}</ProjectGuid>
11+
<TargetFrameworkVersion>v4.3</TargetFrameworkVersion>
12+
<NetMfTargetsBaseDir Condition="'$(NetMfTargetsBaseDir)'==''">$(MSBuildExtensionsPath32)\Microsoft\.NET Micro Framework\</NetMfTargetsBaseDir>
13+
<TargetFrameworkProfile />
14+
</PropertyGroup>
15+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16+
<DebugSymbols>true</DebugSymbols>
17+
<DebugType>full</DebugType>
18+
<Optimize>false</Optimize>
19+
<OutputPath>bin\Debug\</OutputPath>
20+
<DefineConstants>DEBUG;TRACE</DefineConstants>
21+
<ErrorReport>prompt</ErrorReport>
22+
<WarningLevel>4</WarningLevel>
23+
</PropertyGroup>
24+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25+
<DebugType>pdbonly</DebugType>
26+
<Optimize>true</Optimize>
27+
<OutputPath>bin\Release\</OutputPath>
28+
<DefineConstants>TRACE</DefineConstants>
29+
<ErrorReport>prompt</ErrorReport>
30+
<WarningLevel>4</WarningLevel>
31+
</PropertyGroup>
32+
<Import Project="$(NetMfTargetsBaseDir)$(TargetFrameworkVersion)\CSharp.Targets" />
33+
<ItemGroup>
34+
<Compile Include="AssertTests.cs" />
35+
<Compile Include="Program.cs" />
36+
<Compile Include="Properties\AssemblyInfo.cs" />
37+
<Compile Include="Resources.Designer.cs">
38+
<AutoGen>True</AutoGen>
39+
<DesignTime>True</DesignTime>
40+
<DependentUpon>Resources.resx</DependentUpon>
41+
</Compile>
42+
</ItemGroup>
43+
<ItemGroup>
44+
<Reference Include="Microsoft.SPOT.Graphics" />
45+
<Reference Include="Microsoft.SPOT.Native">
46+
</Reference>
47+
<Reference Include="Microsoft.SPOT.TinyCore" />
48+
</ItemGroup>
49+
<ItemGroup>
50+
<EmbeddedResource Include="Resources.resx">
51+
<SubType>Designer</SubType>
52+
<Generator>ResXFileCodeGenerator</Generator>
53+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
54+
</EmbeddedResource>
55+
</ItemGroup>
56+
<ItemGroup>
57+
<ProjectReference Include="..\MFUnit\MFUnit.csproj">
58+
<Project>{EC81132A-FCC6-4294-B60E-B62E4A908C43}</Project>
59+
<Name>MFUnit</Name>
60+
</ProjectReference>
61+
</ItemGroup>
6062
</Project>

‎MFUnit.Tests/Resources.Designer.cs‎

Lines changed: 38 additions & 38 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎MFUnit/MFUnit.csproj‎

Lines changed: 73 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,80 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<AssemblyName>MFUnit</AssemblyName>
5-
<OutputType>Library</OutputType>
6-
<RootNamespace>MFUnit</RootNamespace>
7-
<ProjectTypeGuids>{b69e3092-b931-443c-abe7-7e7b65f2a37f};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
8-
<ProductVersion>9.0.21022</ProductVersion>
9-
<SchemaVersion>2.0</SchemaVersion>
10-
<ProjectGuid>{EC81132A-FCC6-4294-B60E-B62E4A908C43}</ProjectGuid>
11-
<TargetFrameworkVersion Condition="$(TargetFrameworkVersion) == ''">v4.1</TargetFrameworkVersion>
12-
<NetMfTargetsBaseDir Condition="'$(NetMfTargetsBaseDir)'==''">$(MSBuildExtensionsPath32)\Microsoft\.NET Micro Framework\</NetMfTargetsBaseDir>
13-
<!-- Take the target framework version and sanitize it for use with NuGet -->
14-
<NugetVersion>netmf$(TargetFrameworkVersion.Replace('.', '').Replace('v', ''))</NugetVersion>
15-
<!-- Override the standard obj directory so we don't get cache clashes -->
16-
<IntermediateOutputPath>obj\$(NugetVersion)\</IntermediateOutputPath>
17-
</PropertyGroup>
18-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19-
<DebugSymbols>true</DebugSymbols>
20-
<DebugType>full</DebugType>
21-
<Optimize>false</Optimize>
22-
<OutputPath>bin\$(Configuration)\$(NugetVersion)\</OutputPath>
23-
<OutDir>$(OutputPath)</OutDir>
24-
<DefineConstants>DEBUG;TRACE</DefineConstants>
25-
<ErrorReport>prompt</ErrorReport>
26-
<WarningLevel>4</WarningLevel>
27-
</PropertyGroup>
28-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29-
<DebugType>pdbonly</DebugType>
30-
<Optimize>true</Optimize>
31-
<OutputPath>bin\$(Configuration)\$(NugetVersion)\</OutputPath>
32-
<OutDir>$(OutputPath)</OutDir>
33-
<DefineConstants>TRACE</DefineConstants>
34-
<ErrorReport>prompt</ErrorReport>
35-
<WarningLevel>4</WarningLevel>
36-
</PropertyGroup>
37-
<Import Project="$(NetMfTargetsBaseDir)$(TargetFrameworkVersion)\CSharp.Targets" />
38-
<ItemGroup>
39-
<Compile Include="Assert.cs" />
40-
<Compile Include="AssertException.cs" />
41-
<Compile Include="TestResult.cs" />
42-
<Compile Include="Interface\TestRunController.cs" />
43-
<Compile Include="Interface\TestRunView.cs" />
44-
<Compile Include="Properties\AssemblyInfo.cs" />
45-
<Compile Include="Resources.Designer.cs">
46-
<AutoGen>True</AutoGen>
47-
<DesignTime>True</DesignTime>
48-
<DependentUpon>Resources.resx</DependentUpon>
49-
</Compile>
50-
<Compile Include="TestApplication.cs" />
51-
<Compile Include="TestRun.cs" />
52-
</ItemGroup>
53-
<ItemGroup>
54-
<Reference Include="Microsoft.SPOT.Graphics" />
55-
<Reference Include="Microsoft.SPOT.Hardware" />
56-
<Reference Include="Microsoft.SPOT.Native" />
57-
<Reference Include="Microsoft.SPOT.TinyCore" />
58-
</ItemGroup>
59-
<ItemGroup>
60-
<EmbeddedResource Include="Resources.resx">
61-
<Generator>ResXFileCodeGenerator</Generator>
62-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
63-
</EmbeddedResource>
64-
</ItemGroup>
65-
<ItemGroup>
66-
<None Include="Resources\nina14.tinyfnt" />
67-
</ItemGroup>
68-
<Target Name="AfterBuild">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<AssemblyName>MFUnit</AssemblyName>
5+
<OutputType>Library</OutputType>
6+
<RootNamespace>MFUnit</RootNamespace>
7+
<ProjectTypeGuids>{b69e3092-b931-443c-abe7-7e7b65f2a37f};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
8+
<ProductVersion>9.0.21022</ProductVersion>
9+
<SchemaVersion>2.0</SchemaVersion>
10+
<ProjectGuid>{EC81132A-FCC6-4294-B60E-B62E4A908C43}</ProjectGuid>
11+
<TargetFrameworkVersion Condition="$(TargetFrameworkVersion) == ''">v4.3</TargetFrameworkVersion>
12+
<NetMfTargetsBaseDir Condition="'$(NetMfTargetsBaseDir)'==''">$(MSBuildExtensionsPath32)\Microsoft\.NET Micro Framework\</NetMfTargetsBaseDir>
13+
<!-- Take the target framework version and sanitize it for use with NuGet -->
14+
<NugetVersion>netmf$(TargetFrameworkVersion.Replace('.', '').Replace('v', ''))</NugetVersion>
15+
<!-- Override the standard obj directory so we don't get cache clashes -->
16+
<IntermediateOutputPath>obj\$(NugetVersion)\</IntermediateOutputPath>
17+
<TargetFrameworkProfile />
18+
</PropertyGroup>
19+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
20+
<DebugSymbols>true</DebugSymbols>
21+
<DebugType>full</DebugType>
22+
<Optimize>false</Optimize>
23+
<OutputPath>bin\$(Configuration)\$(NugetVersion)\</OutputPath>
24+
<OutDir>$(OutputPath)</OutDir>
25+
<DefineConstants>DEBUG;TRACE</DefineConstants>
26+
<ErrorReport>prompt</ErrorReport>
27+
<WarningLevel>4</WarningLevel>
28+
</PropertyGroup>
29+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
30+
<DebugType>pdbonly</DebugType>
31+
<Optimize>true</Optimize>
32+
<OutputPath>bin\$(Configuration)\$(NugetVersion)\</OutputPath>
33+
<OutDir>$(OutputPath)</OutDir>
34+
<DefineConstants>TRACE</DefineConstants>
35+
<ErrorReport>prompt</ErrorReport>
36+
<WarningLevel>4</WarningLevel>
37+
</PropertyGroup>
38+
<Import Project="$(NetMfTargetsBaseDir)$(TargetFrameworkVersion)\CSharp.Targets" />
39+
<ItemGroup>
40+
<Compile Include="Assert.cs" />
41+
<Compile Include="AssertException.cs" />
42+
<Compile Include="TestResult.cs" />
43+
<Compile Include="Interface\TestRunController.cs" />
44+
<Compile Include="Interface\TestRunView.cs" />
45+
<Compile Include="Properties\AssemblyInfo.cs" />
46+
<Compile Include="Resources.Designer.cs">
47+
<AutoGen>True</AutoGen>
48+
<DesignTime>True</DesignTime>
49+
<DependentUpon>Resources.resx</DependentUpon>
50+
</Compile>
51+
<Compile Include="TestApplication.cs" />
52+
<Compile Include="TestRun.cs" />
53+
</ItemGroup>
54+
<ItemGroup>
55+
<Reference Include="Microsoft.SPOT.Graphics" />
56+
<Reference Include="Microsoft.SPOT.Hardware" />
57+
<Reference Include="Microsoft.SPOT.Native" />
58+
<Reference Include="Microsoft.SPOT.TinyCore" />
59+
</ItemGroup>
60+
<ItemGroup>
61+
<EmbeddedResource Include="Resources.resx">
62+
<Generator>ResXFileCodeGenerator</Generator>
63+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
64+
</EmbeddedResource>
65+
</ItemGroup>
66+
<ItemGroup>
67+
<None Include="Resources\nina14.tinyfnt" />
68+
</ItemGroup>
69+
<Target Name="AfterBuild">
6970
<!--
7071
For reasons unknown invoking this target generates an MMP: error MMP0000: CLR_E_FAIL error on compile.
7172
I believe this might be because the MetaDataProcessor loads a v4.1 assembly into our AppDomain which causes us grief.
7273
To get around this we will just shell out to MSBuild again.
73-
-->
74+
-->
7475
<!--<MSBuild Condition="'$(TargetFrameworkVersion)' != 'v4.2'"
7576
Projects="$(MSBuildProjectFile)"
76-
Properties="TargetFrameworkVersion=v4.2;Configuration=$(Configuration);Platform=$(Platform)" />-->
77-
<Exec Condition="'$(TargetFrameworkVersion)' != 'v4.2'" Command="$(MSBuildBinPath)\msbuild.exe $(MSBuildProjectFile) /p:TargetFrameworkVersion=v4.2;Configuration=$(Configuration);Platform=$(Platform)" />
78-
</Target>
77+
Properties="TargetFrameworkVersion=v4.2;Configuration=$(Configuration);Platform=$(Platform)" />-->
78+
<Exec Condition="'$(TargetFrameworkVersion)' != 'v4.3'" Command="$(MSBuildBinPath)\msbuild.exe $(MSBuildProjectFile) /p:TargetFrameworkVersion=v4.3;Configuration=$(Configuration);Platform=$(Platform)" />
79+
</Target>
7980
</Project>

0 commit comments

Comments
 (0)