microsoft
/
ProtocolTestFramework
зеркало из https://github.com/microsoft/ProtocolTestFramework.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merged PR 651: Unify PTF Version

This commit is contained in:
Huiren Jiang 2018-08-03 08:15:50 +00:00 коммит произвёл Jiajun Wang
Родитель c7f5d2b0ed 4f6153011f
Коммит 4e82a7dcdd
6 изменённых файлов: 6 добавлений и 23 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

9
src/build.cmd
Просмотреть файл

@ -32,7 +32,7 @@ set versionStr="[assembly: AssemblyVersion("1.0.0.0")]"
for /f "delims=" %%i in ('""%FindExe%" "AssemblyVersion" "%path%""') do set versionStr=%%i
set PTF_VERSION=%versionStr:~28,-3%
%buildtool% "%PTF_Root%src\ptf.sln" /t:Clean
%buildtool% "%PTF_Root%src\ptf.sln" /t:Clean /p:Configuration="Release"
if ErrorLevel 1 (
echo Error: Failed to build Protocol Test Framework
exit /b 1
@ -42,11 +42,8 @@ if exist "%PTF_Root%drop" (
rd /s /q "%PTF_Root%drop"
)
if /i "%~1"=="formodel" (
%buildtool% %currentPath%\deploy\Installer\ProtocolTestFrameworkInstaller.wixproj /p:FORMODEL="1" /t:Clean;Rebuild /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=%ptfsnk%
) else (
%buildtool% %currentPath%\deploy\Installer\ProtocolTestFrameworkInstaller.wixproj /t:Clean;Rebuild /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=%ptfsnk%
)
%buildtool% %currentPath%\deploy\Installer\ProtocolTestFrameworkInstaller.wixproj /t:Clean;Rebuild /p:SignAssembly=true /p:AssemblyOriginatorKeyFile=%ptfsnk% /p:Configuration="Release"
if ErrorLevel 1 (
echo Error: Failed to generate the msi installer
exit /b 1

3
src/deploy/Installer/ProtocolTestFrameworkInstaller.wixproj
Просмотреть файл

@ -121,7 +121,6 @@
</ProjectReference>
</ItemGroup>
<Target Name="AfterBuild">
<Copy Condition="$(FORMODEL)==1" SourceFiles="$(TargetDir)en-us\$(TargetFileName).msi" DestinationFiles="$(PTF_Root)drop\ProtocolTestFramework\installer\$(TargetFileName)ForModel.msi" />
<Copy Condition="$(FORMODEL)!=1" SourceFiles="$(TargetDir)en-us\$(TargetFileName).msi" DestinationFolder="$(PTF_Root)drop\ProtocolTestFramework\installer\" />
<Copy SourceFiles="$(TargetDir)en-us\$(TargetFileName).msi" DestinationFolder="$(PTF_Root)drop\ProtocolTestFramework\installer\" />
</Target>
</Project>

3
src/testtools.vsts/PtfTestClassBase.cs
Просмотреть файл

@ -1,7 +1,5 @@
// Copyright (c) Microsoft. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
#if FORMODEL
using System;
using System.Collections.Generic;
using System.Text;
@ -364,4 +362,3 @@ namespace Microsoft.Protocols.TestTools
#endregion
}
}
#endif

6
src/testtools.vsts/TestTools.VSTS.csproj
Просмотреть файл

@ -19,7 +19,6 @@
<Optimize>false</Optimize>
<OutputPath>bin\debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DefineConstants Condition="$(FORMODEL)==1">FORMODEL</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
@ -31,17 +30,14 @@
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<DefineConstants Condition="$(FORMODEL)==1">FORMODEL</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<DocumentationFile>Microsoft.Protocols.TestTools.VSTS.XML</DocumentationFile>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup Condition="$(FORMODEL)==1">
<Reference Include="Microsoft.SpecExplorer.Runtime, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.SpecExplorer.Runtime, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="System" />
<Reference Include="System.Windows.Forms" />

2
src/testtools/IAdapter.cs
Просмотреть файл

@ -11,9 +11,7 @@ namespace Microsoft.Protocols.TestTools
/// <summary>
/// An interface that every adapter must implement.
/// </summary>
#if FORMODEL
[Microsoft.SpecExplorer.Runtime.Testing.TestAdapter]
#endif
public interface IAdapter : IDisposable
{
/// <summary>

6
src/testtools/TestTools.csproj
Просмотреть файл

@ -18,7 +18,6 @@
<Optimize>false</Optimize>
<OutputPath>bin\debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DefineConstants Condition="$(FORMODEL)==1">FORMODEL</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>Microsoft.Protocols.TestTools.XML</DocumentationFile>
@ -32,17 +31,14 @@
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<DefineConstants Condition="$(FORMODEL)==1">FORMODEL</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>Microsoft.Protocols.TestTools.XML</DocumentationFile>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup Condition="$(FORMODEL)==1">
<Reference Include="Microsoft.SpecExplorer.Runtime, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.SpecExplorer.Runtime, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />