Skip to content

Commit b432a4f

Browse files
committed
Remove legacy VS2013 solution
The legacy build has been broken for a while.
1 parent 8b3ffec commit b432a4f

File tree

3 files changed

+25
-167
lines changed

3 files changed

+25
-167
lines changed

build.proj

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,7 @@ of patent rights can be found in the PATENTS file in the same directory.
1818
<PackageOutputDir>output</PackageOutputDir>
1919
<BuildType Condition="'$(BuildType)' == ''">Dev</BuildType>
2020

21-
<!-- Only build ASP.NET 5 projects if on MSBuild 14+ (VS2015+) -->
22-
<BuildAspNet5>false</BuildAspNet5>
23-
<BuildAspNet5 Condition="$(VisualStudioVersion) == '14.0'">true</BuildAspNet5>
24-
<SolutionFile>src\React.VS2015.sln</SolutionFile>
25-
<SolutionFile Condition="$(BuildAspNet5) == 'false'">src\React.sln</SolutionFile>
21+
<SolutionFile>src\React.sln</SolutionFile>
2622
</PropertyGroup>
2723
<ItemGroup>
2824
<PackageAssemblies Include="React.Core" />
@@ -48,7 +44,6 @@ of patent rights can be found in the PATENTS file in the same directory.
4844
/>
4945
<!-- NuGet packages for ASP.NET 5 projects -->
5046
<Exec
51-
Condition="$(BuildAspNet5) == 'true'"
5247
WorkingDirectory="$(MSBuildProjectDirectory)"
5348
Command="dnu restore --quiet --parallel src\React.AspNet src\React.Sample.Mvc6"
5449
/>
@@ -92,7 +87,6 @@ of patent rights can be found in the PATENTS file in the same directory.
9287
build date) and reset it later so the dev build number isn't commited to the repo.
9388
-->
9489
<!--SetEnvironmentVariable
95-
Condition="$(BuildAspNet5) == 'true'"
9690
Name="K_BUILD_VERSION"
9791
Value="$(Build)"
9892
/-->
@@ -155,7 +149,7 @@ of patent rights can be found in the PATENTS file in the same directory.
155149
/>
156150
</Target>
157151

158-
<Target Name="CopyAspNetPackages" AfterTargets="Package" Condition="$(BuildAspNet5) == 'true'">
152+
<Target Name="CopyAspNetPackages" AfterTargets="Package">
159153
<!-- Copy over ASP.NET 5 packages -->
160154
<ItemGroup>
161155
<AspNet5Packages Include="bin/%(PackageAssembliesAspNet5.Identity)/Release/*.nupkg" />

src/React.VS2015.sln

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

src/React.sln

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 14
4-
VisualStudioVersion = 14.0.22609.0
4+
VisualStudioVersion = 14.0.23107.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{F567B25C-E869-4C93-9C96-077761250F87}"
77
EndProject
@@ -15,6 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{CB51F03F
1515
..\build.proj = ..\build.proj
1616
..\dev-build-push.bat = ..\dev-build-push.bat
1717
..\dev-build.bat = ..\dev-build.bat
18+
React.tasks.proj = React.tasks.proj
1819
..\README.md = ..\README.md
1920
..\release-build-push.bat = ..\release-build-push.bat
2021
..\release-build.bat = ..\release-build.bat
@@ -56,6 +57,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "React.Owin", "React.Owin\Re
5657
EndProject
5758
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "React.Sample.Webpack", "React.Sample.Webpack\React.Sample.Webpack.csproj", "{E20376AD-80F7-4865-ACE3-1DE616991DF7}"
5859
EndProject
60+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "React.AspNet", "React.AspNet\React.AspNet.xproj", "{A7ACDB56-5E43-40A6-92C9-2C52228E6074}"
61+
EndProject
62+
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "React.Sample.Mvc6", "React.Sample.Mvc6\React.Sample.Mvc6.xproj", "{022DC77E-5E48-4CF4-AD8B-DC4B9B52E02E}"
63+
EndProject
64+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "React.Sample.ConsoleApp", "React.Sample.ConsoleApp\React.Sample.ConsoleApp.csproj", "{350EFB8E-693C-4DFE-8162-C99C359CFC71}"
65+
EndProject
5966
Global
6067
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6168
Debug|Any CPU = Debug|Any CPU
@@ -114,6 +121,18 @@ Global
114121
{E20376AD-80F7-4865-ACE3-1DE616991DF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
115122
{E20376AD-80F7-4865-ACE3-1DE616991DF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
116123
{E20376AD-80F7-4865-ACE3-1DE616991DF7}.Release|Any CPU.Build.0 = Release|Any CPU
124+
{A7ACDB56-5E43-40A6-92C9-2C52228E6074}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
125+
{A7ACDB56-5E43-40A6-92C9-2C52228E6074}.Debug|Any CPU.Build.0 = Debug|Any CPU
126+
{A7ACDB56-5E43-40A6-92C9-2C52228E6074}.Release|Any CPU.ActiveCfg = Release|Any CPU
127+
{A7ACDB56-5E43-40A6-92C9-2C52228E6074}.Release|Any CPU.Build.0 = Release|Any CPU
128+
{022DC77E-5E48-4CF4-AD8B-DC4B9B52E02E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
129+
{022DC77E-5E48-4CF4-AD8B-DC4B9B52E02E}.Debug|Any CPU.Build.0 = Debug|Any CPU
130+
{022DC77E-5E48-4CF4-AD8B-DC4B9B52E02E}.Release|Any CPU.ActiveCfg = Release|Any CPU
131+
{022DC77E-5E48-4CF4-AD8B-DC4B9B52E02E}.Release|Any CPU.Build.0 = Release|Any CPU
132+
{350EFB8E-693C-4DFE-8162-C99C359CFC71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
133+
{350EFB8E-693C-4DFE-8162-C99C359CFC71}.Debug|Any CPU.Build.0 = Debug|Any CPU
134+
{350EFB8E-693C-4DFE-8162-C99C359CFC71}.Release|Any CPU.ActiveCfg = Release|Any CPU
135+
{350EFB8E-693C-4DFE-8162-C99C359CFC71}.Release|Any CPU.Build.0 = Release|Any CPU
117136
EndGlobalSection
118137
GlobalSection(SolutionProperties) = preSolution
119138
HideSolutionNode = FALSE
@@ -132,5 +151,8 @@ Global
132151
{84C5EB9D-FB4E-44C3-91C4-2F2393C58B39} = {A51CE5B6-294F-4D39-B32B-BF08DAF9B40B}
133152
{C3BF8D49-B7CC-4D7F-B0F0-A94347C595EA} = {681C45FB-103C-48BC-B992-20C5B6B78F92}
134153
{E20376AD-80F7-4865-ACE3-1DE616991DF7} = {A51CE5B6-294F-4D39-B32B-BF08DAF9B40B}
154+
{A7ACDB56-5E43-40A6-92C9-2C52228E6074} = {681C45FB-103C-48BC-B992-20C5B6B78F92}
155+
{022DC77E-5E48-4CF4-AD8B-DC4B9B52E02E} = {A51CE5B6-294F-4D39-B32B-BF08DAF9B40B}
156+
{350EFB8E-693C-4DFE-8162-C99C359CFC71} = {A51CE5B6-294F-4D39-B32B-BF08DAF9B40B}
135157
EndGlobalSection
136158
EndGlobal

0 commit comments

Comments
 (0)