Skip to content

Commit

Permalink
cleanup and push version to 3
Browse files Browse the repository at this point in the history
  • Loading branch information
Andreas Willich committed Sep 4, 2017
1 parent 0619f52 commit 874fc6b
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 85 deletions.
2 changes: 1 addition & 1 deletion Build/Versioning.targets
Expand Up @@ -19,7 +19,7 @@
</UsingTask>

<PropertyGroup>
<SpecFlowBaseVersion Condition="'$(SpecFlowBaseVersion)' == ''">2.2.0</SpecFlowBaseVersion>
<SpecFlowBaseVersion Condition="'$(SpecFlowBaseVersion)' == ''">3.0.0</SpecFlowBaseVersion>
</PropertyGroup>


Expand Down
61 changes: 0 additions & 61 deletions Installer/SpecFlowBinPackage/SpecFlowBinPackage.csproj

This file was deleted.

8 changes: 4 additions & 4 deletions TechTalk.SpecFlow.Tools/app.config
Expand Up @@ -4,19 +4,19 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="TechTalk.SpecFlow.Generator" publicKeyToken="0778194805d6db41" culture="neutral" />
<bindingRedirect oldVersion="1.9.0.0-2.2.0.0" newVersion="2.2.0.0" />
<bindingRedirect oldVersion="1.9.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="TechTalk.SpecFlow.Parser" publicKeyToken="0778194805d6db41" culture="neutral" />
<bindingRedirect oldVersion="1.9.0.0-2.2.0.0" newVersion="2.2.0.0" />
<bindingRedirect oldVersion="1.9.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="TechTalk.SpecFlow.Utils" publicKeyToken="0778194805d6db41" culture="neutral" />
<bindingRedirect oldVersion="1.9.0.0-2.2.0.0" newVersion="2.2.0.0" />
<bindingRedirect oldVersion="1.9.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="TechTalk.SpecFlow" publicKeyToken="0778194805d6db41" culture="neutral" />
<bindingRedirect oldVersion="1.9.0.0-2.2.0.0" newVersion="2.2.0.0" />
<bindingRedirect oldVersion="1.9.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
8 changes: 0 additions & 8 deletions TechTalk.SpecFlow.sln
Expand Up @@ -25,8 +25,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{D87E7021
Build\Versioning.targets = Build\Versioning.targets
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SpecFlowBinPackage", "Installer\SpecFlowBinPackage\SpecFlowBinPackage.csproj", "{27B6695E-7049-4C1B-8820-812722128D9E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGetPackages", "Installer\NuGetPackages\NuGetPackages.csproj", "{7A9F3EE4-2FAE-4AA3-95DF-4D9F7D879E7C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TechTalk.SpecFlow.Specs", "Tests\TechTalk.SpecFlow.Specs\TechTalk.SpecFlow.Specs.csproj", "{2D7D31B3-E8D0-445A-BB24-216ABA3CB778}"
Expand Down Expand Up @@ -60,11 +58,6 @@ Global
VS2010IntegrationTest|Any CPU = VS2010IntegrationTest|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{27B6695E-7049-4C1B-8820-812722128D9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{27B6695E-7049-4C1B-8820-812722128D9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{27B6695E-7049-4C1B-8820-812722128D9E}.Release|Any CPU.Build.0 = Release|Any CPU
{27B6695E-7049-4C1B-8820-812722128D9E}.VS2010IntegrationTest|Any CPU.ActiveCfg = Debug|Any CPU
{27B6695E-7049-4C1B-8820-812722128D9E}.VS2010IntegrationTest|Any CPU.Build.0 = Debug|Any CPU
{7A9F3EE4-2FAE-4AA3-95DF-4D9F7D879E7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7A9F3EE4-2FAE-4AA3-95DF-4D9F7D879E7C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7A9F3EE4-2FAE-4AA3-95DF-4D9F7D879E7C}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -149,7 +142,6 @@ Global
GlobalSection(NestedProjects) = preSolution
{0359B7D7-7E29-48E9-8DF9-7D1FACFA5CFA} = {A10B5CD6-38EC-4D7E-9D1C-2EBA8017E437}
{D87E7021-4926-4F5A-AC81-92AFC575FB7E} = {577A0375-1436-446C-802B-3C75C8CEF94F}
{27B6695E-7049-4C1B-8820-812722128D9E} = {DCE0C3C4-5BC6-4A30-86BE-3FEFF4677A01}
{7A9F3EE4-2FAE-4AA3-95DF-4D9F7D879E7C} = {DCE0C3C4-5BC6-4A30-86BE-3FEFF4677A01}
{2D7D31B3-E8D0-445A-BB24-216ABA3CB778} = {A10B5CD6-38EC-4D7E-9D1C-2EBA8017E437}
{6F6B4286-382F-4134-AE5A-AFC4C80F588F} = {A10B5CD6-38EC-4D7E-9D1C-2EBA8017E437}
Expand Down
14 changes: 3 additions & 11 deletions appveyor.yml
Expand Up @@ -6,8 +6,8 @@ branches:
- master

environment:
SpecFlowBaseVersion: 2.2.0
SpecFlowPackageVersion: "2.2.0-ci$(APPVEYOR_BUILD_NUMBER)"
SpecFlowBaseVersion: 3.0.0
SpecFlowPackageVersion: "3.0.0-ci$(APPVEYOR_BUILD_NUMBER)"

cache:
- packages -> **\packages.config
Expand Down Expand Up @@ -40,14 +40,6 @@ test_script:
- vstest.console /logger:Appveyor "Tests\TechTalk.SpecFlow.Specs\bin\Debug\net452\TechTalk.SpecFlow.Specs.dll" /TestAdapterPath:%USERPROFILE%\.nuget\packages\nunit3testadapter\3.8.0
- vstest.console /logger:Appveyor "Tests\TechTalk.SpecFlow.IntegrationTests\bin\Debug\net452\TechTalk.SpecFlow.IntegrationTests.dll" /TestAdapterPath:%USERPROFILE%\.nuget\packages\nunit3testadapter\3.8.0

#test:
# assemblies:
# - TechTalk.SpecFlow.GeneratorTests.dll
# - TechTalk.SpecFlow.RuntimeTests.dll
# - TechTalk.SpecFlow.IntegrationTests.dll
# - TechTalk.SpecFlow.Specs.dll

artifacts:
- path: '\Installer\NuGetPackages\bin\SpecFlow.*.nupkg'
- path: Installer\SpecFlowBinPackage\bin\SpecFlowBinPackage.zip
- path: Installer\SpecFlowBinPackage\bin\SpecFlowSymbolPackage.zip
- path: '\Installer\NuGetPackages\bin\SpecFlow.*.nupkg'

0 comments on commit 874fc6b

Please sign in to comment.