Skip to content

Commit 9bc1388

Browse files
Daniel15Daniel15
authored
Upgrade to Visual Studio 2017 + csproj tooling (#406)
* Upgrade to Visual Studio 2017 + csproj tooling * Include workaround for NuGet/Home#4337 (explicitly specify version when restoring NuGet packages) * Work around dotnet/cli-migrate#11 * Upgrade to .NET Core 1.1.x * Remove VersionPrefix from all csproj files * Legacy NuGet restore is no longer needed * Disable CS1701 warning for sample projects * Turns out we actually do need the legacy NuGet restore * Use VS2017 AppVeyor image * Remove project dependencies to work around NuGet/Home#5193 and NuGet/Home#4578 * Use MSBuild 15 on AppVeyor * Enforce .NET Core tools 1.0.0 in global.json * Use newer npm on AppVeyor (as a workaround for https://github.com/dotnet/cli/issues/6561 and dotnet/msbuild#406), and run correct test command
1 parent ae03dc7 commit 9bc1388

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+635
-944
lines changed

‎appveyor.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
version: '{build}'
2-
os: Visual Studio 2015
2+
os: Visual Studio 2017
33
install:
4-
- set PATH=%ProgramFiles(x86)%\MSBuild\14.0\Bin;%PATH%
4+
- set PATH=%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\;%PATH%
5+
- ps: Install-Product node 6
6+
- npm install --global npm
57
build:
68
project: build.proj
79
verbosity: normal
810
test_script:
9-
- dotnet test --configuration Release --no-build tests/React.Tests
11+
- dotnet test --configuration Release --no-build tests/React.Tests/React.Tests.csproj
1012
artifacts:
1113
- path: output\*.nupkg

‎build.proj

+15-22
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ of patent rights can be found in the PATENTS file in the same directory.
1515
<Revision>0</Revision>
1616
<DevNuGetServer>http://reactjs.net/packages/</DevNuGetServer>
1717
<MSBuildCommunityTasksPath>$(MSBuildProjectDirectory)\tools\MSBuildTasks</MSBuildCommunityTasksPath>
18-
<PackageOutputDir>output</PackageOutputDir>
18+
<PackageOutputDir>$(MSBuildProjectDirectory)\output</PackageOutputDir>
1919
<BuildType Condition="'$(BuildType)' == ''">Dev</BuildType>
2020

2121
<SolutionFile>src\React.sln</SolutionFile>
@@ -31,18 +31,18 @@ of patent rights can be found in the PATENTS file in the same directory.
3131
<PackageAssemblies Include="System.Web.Optimization.React" />
3232
</ItemGroup>
3333

34-
<Import Project="src/React.tasks.proj" />
35-
36-
<Target Name="RestorePackages" DependsOnTargets="Clean">
37-
<!-- NuGet packages for .xproj projects -->
34+
<Import Project="$(MSBuildProjectDirectory)\tools\MSBuildTasks\MSBuild.Community.Tasks.Targets" />
35+
36+
<Target Name="RestorePackages" DependsOnTargets="Clean;UpdateVersion">
37+
<!-- NuGet packages for "legacy" projects (eg. React.Samples.Mvc4) -->
3838
<Exec
3939
WorkingDirectory="$(MSBuildProjectDirectory)"
40-
Command="dotnet restore"
40+
Command="tools\NuGet\nuget.exe restore $(SolutionFile)"
4141
/>
42-
<!-- NuGet packages for "legacy" projects (eg. React.Samples.Mvc4) -->
42+
<!-- NuGet packages for modern .csproj projects -->
4343
<Exec
4444
WorkingDirectory="$(MSBuildProjectDirectory)"
45-
Command="tools\NuGet\nuget.exe restore $(SolutionFile)"
45+
Command="dotnet restore $(SolutionFile) /p:Version=$(VersionString)"
4646
/>
4747
<!-- npm packages -->
4848
<Exec
@@ -64,25 +64,18 @@ of patent rights can be found in the PATENTS file in the same directory.
6464
</Time>
6565
<!-- Prepend date to build version if a dev build-->
6666
<PropertyGroup Condition="$(BuildType) == 'Release'">
67-
<BuildSuffix></BuildSuffix>
68-
<BuildWithSuffix>$(Build)</BuildWithSuffix>
67+
<VersionString>$(Major).$(Minor).$(Build)</VersionString>
6968
</PropertyGroup>
7069
<PropertyGroup Condition="$(BuildType) != 'Release'">
71-
<BuildSuffix>dev-$(Date)</BuildSuffix>
72-
<BuildWithSuffix>$(Build)-$(BuildSuffix)</BuildWithSuffix>
70+
<VersionString>$(Major).$(Minor).$(Build)-dev-$(Date)</VersionString>
7371
</PropertyGroup>
7472
<!-- Set version for assemblies -->
7573
<AssemblyInfo
7674
CodeLanguage="CS"
7775
OutputFile="src\SharedAssemblyVersionInfo.cs"
7876
AssemblyVersion="$(Major).$(Minor)"
79-
AssemblyFileVersion="$(Major).$(Minor).$(BuildWithSuffix).$(Revision)"
80-
AssemblyInformationalVersion="$(Major).$(Minor).$(BuildWithSuffix)"
81-
/>
82-
<!-- Ensure version numbers in project.json files are in sync -->
83-
<UpdateAspNetProjectVersion
84-
Files="src/%(PackageAssemblies.Identity)/project.json"
85-
Version="$(Major).$(Minor).$(Build)-*"
77+
AssemblyFileVersion="$(VersionString).$(Revision)"
78+
AssemblyInformationalVersion="$(VersionString)"
8679
/>
8780
</Target>
8881

@@ -97,14 +90,14 @@ of patent rights can be found in the PATENTS file in the same directory.
9790

9891
<Target Name="Build" DependsOnTargets="RestorePackages;UpdateVersion">
9992
<Exec WorkingDirectory="src/React.Core" Command="node_modules/.bin/gulp" />
100-
<MSBuild Projects="$(SolutionFile)" Targets="Rebuild" Properties="Configuration=Release;Platform=Any CPU;NoWarn=1607,7035" />
93+
<MSBuild Projects="$(SolutionFile)" Targets="Rebuild" Properties="Configuration=Release;Platform=Any CPU;NoWarn=1607,7035,1701;Version=$(VersionString)" />
10194
<Exec WorkingDirectory="src/React.Sample.Webpack" Command="node_modules/.bin/webpack" />
10295
</Target>
10396

10497
<Target Name="Test" DependsOnTargets="Build">
10598
<Exec
10699
WorkingDirectory="$(MSBuildProjectDirectory)"
107-
Command="dotnet test --configuration Release --no-build tests/React.Tests"
100+
Command="dotnet test --configuration Release --no-build tests/React.Tests/React.Tests.csproj"
108101
/>
109102
</Target>
110103

@@ -116,7 +109,7 @@ of patent rights can be found in the PATENTS file in the same directory.
116109
<MakeDir Directories="$(PackageOutputDir)" />
117110
<Exec
118111
WorkingDirectory="$(MSBuildProjectDirectory)"
119-
Command="dotnet pack --output $(PackageOutputDir) --configuration Release --version-suffix $(BuildSuffix) --no-build src/%(PackageAssemblies.Identity)"
112+
Command="dotnet pack --output $(PackageOutputDir) --configuration Release --no-build src/%(PackageAssemblies.Identity) /p:Version=$(VersionString)"
120113
/>
121114
</Target>
122115

‎dev-build-push.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@echo off
2-
"%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" build.proj /t:Package;Push /p:BuildType=Dev
3-
pause
2+
"%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" build.proj /t:Package;Push /p:BuildType=Dev
3+
pause

‎dev-build.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@echo off
2-
"%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" build.proj
3-
pause
2+
"%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" build.proj
3+
pause

‎global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "1.0.0-preview2-003121"
3+
"version": "1.0.0"
44
},
55
"projects": [ "src", "test" ]
6-
}
6+
}

‎release-build-push.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@echo off
2-
"%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" build.proj /t:Package;Push /p:BuildType=Release
3-
pause
2+
"%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" build.proj /t:Package;Push /p:BuildType=Release
3+
pause

‎release-build.bat

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@echo off
2-
"%ProgramFiles(x86)%\MSBuild\14.0\Bin\MSBuild.exe" build.proj /p:BuildType=Release
3-
pause
2+
"%ProgramFiles(x86)%\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\MSBuild.exe" build.proj /p:BuildType=Release
3+
pause

‎src/Cassette.React/Cassette.React.csproj

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<Description>Allows you to transpile JavaScript via Babel using Cassette.</Description>
5+
<Copyright>Copyright 2014-Present Facebook, Inc</Copyright>
6+
<AssemblyTitle>ReactJS.NET - Babel for Cassette</AssemblyTitle>
7+
<Authors>Daniel Lo Nigro</Authors>
8+
<TargetFramework>net40</TargetFramework>
9+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
10+
<AssemblyName>Cassette.React</AssemblyName>
11+
<PackageId>Cassette.React</PackageId>
12+
<PackageTags>asp.net;mvc;asp;jquery;javascript;js;react;facebook;reactjs;babel;cassette</PackageTags>
13+
<PackageIconUrl>http://reactjs.net/img/logo_64.png</PackageIconUrl>
14+
<PackageProjectUrl>http://reactjs.net/</PackageProjectUrl>
15+
<PackageLicenseUrl>https://github.com/reactjs/React.NET#licence</PackageLicenseUrl>
16+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
17+
</PropertyGroup>
18+
19+
<ItemGroup>
20+
<Compile Include="..\SharedAssemblyInfo.cs" />
21+
<Compile Include="..\SharedAssemblyVersionInfo.cs" />
22+
</ItemGroup>
23+
24+
<ItemGroup>
25+
<ProjectReference Include="..\React.Core\React.Core.csproj" />
26+
</ItemGroup>
27+
28+
<ItemGroup>
29+
<PackageReference Include="Cassette" Version="2.4.2" />
30+
</ItemGroup>
31+
32+
<ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
33+
<Reference Include="System" />
34+
<Reference Include="Microsoft.CSharp" />
35+
</ItemGroup>
36+
37+
</Project>

‎src/Cassette.React/Cassette.React.xproj

-19
This file was deleted.

‎src/Cassette.React/project.json

-37
This file was deleted.

‎src/React.AspNet/React.AspNet.csproj

+53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<Description>ReactJS and Babel tools for ASP.NET Core, including ASP.NET Core MVC. Please refer to project site (http://reactjs.net/) for full installation instructions, usage examples and sample code</Description>
5+
<Copyright>Copyright 2014-Present Facebook, Inc</Copyright>
6+
<AssemblyTitle>ReactJS.NET (ASP.NET Core MVC)</AssemblyTitle>
7+
<Authors>Daniel Lo Nigro</Authors>
8+
<TargetFrameworks>net451;netstandard1.6</TargetFrameworks>
9+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
10+
<AssemblyName>React.AspNet</AssemblyName>
11+
<AssemblyOriginatorKeyFile>../key.snk</AssemblyOriginatorKeyFile>
12+
<SignAssembly>true</SignAssembly>
13+
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
14+
<PackageId>React.AspNet</PackageId>
15+
<PackageTags>asp.net;mvc;asp;javascript;js;react;facebook;reactjs;vnext;asp.net 5</PackageTags>
16+
<PackageIconUrl>http://reactjs.net/img/logo_64.png</PackageIconUrl>
17+
<PackageProjectUrl>http://reactjs.net/</PackageProjectUrl>
18+
<PackageLicenseUrl>https://github.com/reactjs/React.NET#licence</PackageLicenseUrl>
19+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
20+
<DefineConstants>$(DefineConstants);ASPNETCORE</DefineConstants>
21+
</PropertyGroup>
22+
23+
<ItemGroup>
24+
<Compile Include="..\SharedAssemblyInfo.cs" />
25+
<Compile Include="..\SharedAssemblyVersionInfo.cs" />
26+
</ItemGroup>
27+
28+
<ItemGroup>
29+
<ProjectReference Include="..\React.Core\React.Core.csproj" />
30+
</ItemGroup>
31+
32+
<ItemGroup>
33+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="1.1.2" />
34+
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.1" />
35+
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="1.1.0" />
36+
<PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="1.1.2" />
37+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.1.0" />
38+
</ItemGroup>
39+
40+
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
41+
<Reference Include="System" />
42+
<Reference Include="Microsoft.CSharp" />
43+
</ItemGroup>
44+
45+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
46+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
47+
</PropertyGroup>
48+
49+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
50+
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="1.1.1" />
51+
</ItemGroup>
52+
53+
</Project>

‎src/React.AspNet/React.AspNet.xproj

-19
This file was deleted.

‎src/React.AspNet/project.json

-55
This file was deleted.

0 commit comments

Comments
 (0)