Skip to content

Commit 4c21351

Browse files
robdmoorerobdmoore
committed
Merge pull request #28 from TestStack/ci-upgrade
CI upgrade
2 parents 12747ff + d6c6020 commit 4c21351

File tree

12 files changed

+12
-182
lines changed

12 files changed

+12
-182
lines changed

‎.nuget/NuGet.Config

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

‎.nuget/NuGet.exe

-635 KB
Binary file not shown.

‎.nuget/NuGet.targets

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

‎NextVersion.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.1.0

‎Samples/TestStack.FluentMVCTesting.Sample.Tests/TestStack.FluentMVCTesting.Sample.Tests.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
15-
<RestorePackages>true</RestorePackages>
1615
</PropertyGroup>
1716
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1817
<DebugSymbols>true</DebugSymbols>
@@ -94,12 +93,11 @@
9493
</ProjectReference>
9594
</ItemGroup>
9695
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
97-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
9896
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
9997
Other similar extension points exist, see Microsoft.Common.targets.
10098
<Target Name="BeforeBuild">
10199
</Target>
102100
<Target Name="AfterBuild">
103101
</Target>
104102
-->
105-
</Project>
103+
</Project>

‎Samples/TestStack.FluentMVCTesting.Sample/TestStack.FluentMVCTesting.Sample.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
<IISExpressWindowsAuthentication />
2222
<IISExpressUseClassicPipelineMode />
2323
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
24-
<RestorePackages>true</RestorePackages>
2524
</PropertyGroup>
2625
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2726
<DebugSymbols>true</DebugSymbols>
@@ -329,11 +328,10 @@
329328
</FlavorProperties>
330329
</VisualStudio>
331330
</ProjectExtensions>
332-
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
333331
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
334332
Other similar extension points exist, see Microsoft.Common.targets.
335333
<Target Name="BeforeBuild">
336334
</Target>
337335
<Target Name="AfterBuild">
338336
</Target> -->
339-
</Project>
337+
</Project>

‎TestStack.FluentMVCTesting.Mvc3/TestStack.FluentMVCTesting.Mvc3.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
16-
<RestorePackages>true</RestorePackages>
1716
</PropertyGroup>
1817
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1918
<DebugSymbols>true</DebugSymbols>
@@ -99,12 +98,11 @@
9998
<None Include="packages.config" />
10099
</ItemGroup>
101100
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
102-
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
103101
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
104102
Other similar extension points exist, see Microsoft.Common.targets.
105103
<Target Name="BeforeBuild">
106104
</Target>
107105
<Target Name="AfterBuild">
108106
</Target>
109107
-->
110-
</Project>
108+
</Project>

‎TestStack.FluentMVCTesting.Mvc3/FluentMVCTesting.Mvc3.nuspec renamed to ‎TestStack.FluentMVCTesting.Mvc3/TestStack.FluentMVCTesting.Mvc3.nuspec

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,6 @@
3939
<files>
4040
<file src="bin\Release\TestStack.FluentMVCTesting.Mvc3.dll" target="lib\NET40" />
4141
<file src="bin\Release\TestStack.FluentMVCTesting.Mvc3.pdb" target="lib\NET40" />
42+
<file src="..\TestStack.FluentMvcTesting\**\*.cs" exclude="..\TestStack.FluentMvcTesting\obj\**\*.*" target="src" />
4243
</files>
43-
</package>
44+
</package>

‎TestStack.FluentMVCTesting.Tests/TestStack.FluentMVCTesting.Tests.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
16-
<RestorePackages>true</RestorePackages>
1716
</PropertyGroup>
1817
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1918
<DebugSymbols>true</DebugSymbols>
@@ -100,12 +99,11 @@
10099
</ProjectReference>
101100
</ItemGroup>
102101
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
103-
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
104102
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
105103
Other similar extension points exist, see Microsoft.Common.targets.
106104
<Target Name="BeforeBuild">
107105
</Target>
108106
<Target Name="AfterBuild">
109107
</Target>
110108
-->
111-
</Project>
109+
</Project>

‎TestStack.FluentMVCTesting.sln

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Files", "Solution
1414
README.md = README.md
1515
EndProjectSection
1616
EndProject
17-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{EC0FFD15-639A-4B63-94EB-FCA8CC899547}"
18-
ProjectSection(SolutionItems) = preProject
19-
.nuget\NuGet.Config = .nuget\NuGet.Config
20-
.nuget\NuGet.exe = .nuget\NuGet.exe
21-
.nuget\NuGet.targets = .nuget\NuGet.targets
22-
EndProjectSection
23-
EndProject
2417
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{46E90596-A670-4D0B-B036-C7859573C89E}"
2518
EndProject
2619
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestStack.FluentMVCTesting.Sample", "Samples\TestStack.FluentMVCTesting.Sample\TestStack.FluentMVCTesting.Sample.csproj", "{0BD41AAC-8155-4328-A1A2-CB634430BB39}"

‎TestStack.FluentMvcTesting/TestStack.FluentMVCTesting.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
16-
<RestorePackages>true</RestorePackages>
1716
</PropertyGroup>
1817
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1918
<DebugSymbols>true</DebugSymbols>
@@ -88,12 +87,11 @@
8887
<None Include="packages.config" />
8988
</ItemGroup>
9089
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
91-
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
9290
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
9391
Other similar extension points exist, see Microsoft.Common.targets.
9492
<Target Name="BeforeBuild">
9593
</Target>
9694
<Target Name="AfterBuild">
9795
</Target>
9896
-->
99-
</Project>
97+
</Project>

‎TestStack.FluentMvcTesting/FluentMVCTesting.nuspec renamed to ‎TestStack.FluentMvcTesting/TestStack.FluentMVCTesting.nuspec

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
</frameworkAssemblies>
3838
</metadata>
3939
<files>
40-
<file src="bin\Release\TestStack.FluentMVCTesting.dll" target="lib\NET40" />
41-
<file src="bin\Release\TestStack.FluentMVCTesting.pdb" target="lib\NET40" />
40+
<file src="bin\Release\TestStack.FluentMVCTesting.dll" target="lib\NET40" />
41+
<file src="bin\Release\TestStack.FluentMVCTesting.pdb" target="lib\NET40" />
42+
<file src="**\*.cs" exclude="obj\**\*.*" target="src" />
4243
</files>
43-
</package>
44+
</package>

0 commit comments

Comments
 (0)