Permalink
Browse files

Migrate to csproj (#703)

Migrate to csproj
1 parent 795aac2 commit a79bc75671d88c5b8ae7b6df14817ccc9c5d0e27 @SteveSandersonMS SteveSandersonMS committed on GitHub Feb 28, 2017
Showing with 576 additions and 980 deletions.
  1. +2 −0 .gitignore
  2. +179 −103 JavaScriptServices.sln
  3. +2 −3 NuGet.master.config → NuGet.config
  4. +0 −4 global.json
  5. +0 −23 pack-local.sh
  6. +29 −0 samples/angular/MusicStore/MusicStore.csproj
  7. +0 −20 samples/angular/MusicStore/MusicStore.xproj
  8. +0 −79 samples/angular/MusicStore/project.json
  9. +17 −0 samples/misc/LatencyTest/LatencyTest.csproj
  10. +0 −19 samples/misc/LatencyTest/LatencyTest.xproj
  11. +0 −20 samples/misc/LatencyTest/project.json
  12. +24 −0 samples/misc/NodeServicesExamples/NodeServicesExamples.csproj
  13. +0 −20 samples/misc/NodeServicesExamples/NodeServicesExamples.xproj
  14. +0 −43 samples/misc/NodeServicesExamples/project.json
  15. +0 −11 samples/misc/Webpack/Dockerfile
  16. +24 −0 samples/misc/Webpack/Webpack.csproj
  17. +0 −20 samples/misc/Webpack/Webpack.xproj
  18. +0 −45 samples/misc/Webpack/project.json
  19. +37 −0 samples/react/MusicStore/MusicStore.csproj
  20. +0 −20 samples/react/MusicStore/MusicStore.xproj
  21. +0 −80 samples/react/MusicStore/project.json
  22. +23 −0 samples/react/ReactGrid/ReactGrid.csproj
  23. +0 −20 samples/react/ReactGrid/ReactGrid.xproj
  24. +0 −37 samples/react/ReactGrid/project.json
  25. +22 −0 src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.csproj
  26. +0 −18 src/Microsoft.AspNetCore.AngularServices/Microsoft.AspNetCore.AngularServices.xproj
  27. +0 −12 src/Microsoft.AspNetCore.AngularServices/Properties/AssemblyInfo.cs
  28. +0 −28 src/Microsoft.AspNetCore.AngularServices/project.json
  29. +36 −0 src/Microsoft.AspNetCore.NodeServices.Sockets/Microsoft.AspNetCore.NodeServices.Sockets.csproj
  30. +0 −12 src/Microsoft.AspNetCore.NodeServices.Sockets/Properties/AssemblyInfo.cs
  31. +1 −1 src/Microsoft.AspNetCore.NodeServices.Sockets/TypeScript/SocketNodeInstanceEntryPoint.ts
  32. +0 −39 src/Microsoft.AspNetCore.NodeServices.Sockets/project.json
  33. +35 −0 src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.csproj
  34. +0 −18 src/Microsoft.AspNetCore.NodeServices/Microsoft.AspNetCore.NodeServices.xproj
  35. +0 −12 src/Microsoft.AspNetCore.NodeServices/Properties/AssemblyInfo.cs
  36. +0 −45 src/Microsoft.AspNetCore.NodeServices/project.json
  37. +22 −0 src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.csproj
  38. +0 −18 src/Microsoft.AspNetCore.ReactServices/Microsoft.AspNetCore.ReactServices.xproj
  39. +0 −12 src/Microsoft.AspNetCore.ReactServices/Properties/AssemblyInfo.cs
  40. +0 −28 src/Microsoft.AspNetCore.ReactServices/project.json
  41. +25 −0 src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.csproj
  42. +0 −18 src/Microsoft.AspNetCore.SpaServices/Microsoft.AspNetCore.SpaServices.xproj
  43. +0 −12 src/Microsoft.AspNetCore.SpaServices/Properties/AssemblyInfo.cs
  44. +1 −1 src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/package.json
  45. +39 −0 src/Microsoft.AspNetCore.SpaServices/npm/aspnet-webpack/src/WebpackDevMiddleware.ts
  46. +0 −37 src/Microsoft.AspNetCore.SpaServices/project.json
  47. BIN {tools → src/build}/Key.snk
  48. +19 −0 src/build/common.props
  49. +1 −1 templates/Angular2Spa/Angular2Spa.csproj
  50. +1 −1 templates/AureliaSpa/{Aurelia.csproj → AureliaSpa.csproj}
  51. +1 −1 templates/KnockoutSpa/KnockoutSpa.csproj
  52. +1 −1 templates/ReactReduxSpa/ReactReduxSpa.csproj
  53. +1 −1 templates/ReactSpa/ReactSpa.csproj
  54. +34 −0 templates/WebApplicationBasic/WebApplicationBasic.csproj
  55. +0 −20 templates/WebApplicationBasic/WebApplicationBasic.xproj
  56. +0 −77 templates/WebApplicationBasic/project.json
View
@@ -39,3 +39,5 @@ npm-debug.log
/templates/*/ClientApp/dist/
/templates/*/yarn.lock
.vscode/
+
+/templates/*/Properties/launchSettings.json
View
Oops, something went wrong.
View
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
- <clear />
- <add key="AspNetVNext" value="https://www.myget.org/f/aspnetmaster/api/v3/index.json" />
+ <add key="AspNetCoreTools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
</packageSources>
-</configuration>
+</configuration>
View
@@ -1,4 +0,0 @@
-{
- "projects": ["src"],
- "sdk": { "version": "1.0.0-preview2-1-003177" }
-}
View
@@ -1,23 +0,0 @@
-versionSuffix=$1
-dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-projects=(
- ./src/Microsoft.AspNetCore.NodeServices
- ./src/Microsoft.AspNetCore.NodeServices.Sockets
- ./src/Microsoft.AspNetCore.SpaServices
- ./src/Microsoft.AspNetCore.AngularServices
- ./src/Microsoft.AspNetCore.ReactServices
-)
-
-if [ -z "$versionSuffix" ]; then
- echo "Usage: pack-local.sh <versionsuffix>"
- echo "Example: pack-local.sh beta-000001"
- exit 1
-fi
-
-pushd $dir > /dev/null
-
-for proj in "${projects[@]}"; do
- dotnet pack $proj --version-suffix $versionSuffix -o ./artifacts/
-done
-
-popd > /dev/null
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+ <PropertyGroup>
+ <TargetFramework>netcoreapp1.1</TargetFramework>
+ <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
+ <IsPackable>false</IsPackable>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.AngularServices\Microsoft.AspNetCore.AngularServices.csproj" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Microsoft.AspNetCore" Version="1.1.0" />
+ <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="1.1.0" />
+ <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.0" />
+ <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.0" />
+ <PackageReference Include="Microsoft.EntityFrameworkCore.SQLite" Version="1.1.0" />
+ <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.0" />
+ <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.0" />
+ <PackageReference Include="AutoMapper" Version="5.0.2" />
+ </ItemGroup>
+
+ <Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
+ <Exec Command="npm install" />
+ <Exec Command="gulp" />
+ </Target>
+
+</Project>
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
- <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
- <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
- </PropertyGroup>
- <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
- <PropertyGroup Label="Globals">
- <ProjectGuid>1a74148f-9dc0-435d-b5ac-7d1b0d3d5e0b</ProjectGuid>
- <RootNamespace>MusicStore</RootNamespace>
- <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
- <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
- </PropertyGroup>
- <PropertyGroup>
- <SchemaVersion>2.0</SchemaVersion>
- <DevelopmentServerPort>5068</DevelopmentServerPort>
- </PropertyGroup>
- <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
@@ -1,79 +0,0 @@
-{
- "version": "1.0.0-*",
- "buildOptions": {
- "emitEntryPoint": true,
- "preserveCompilationContext": true
- },
- "runtimeOptions": {
- "configProperties": {
- "System.GC.Server": true
- }
- },
- "tooling": {
- "defaultNamespace": "MusicStore"
- },
-
- "dependencies": {
- "Microsoft.NETCore.App": {
- "version": "1.1.0",
- "type": "platform"
- },
- "Microsoft.AspNetCore.AngularServices": "1.1.0-*",
- "Microsoft.AspNetCore.Diagnostics": "1.1.0",
- "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.1.0",
- "Microsoft.AspNetCore.Mvc": "1.1.0",
- "Microsoft.AspNetCore.Razor.Tools": {
- "version": "1.0.0-preview2-final",
- "type": "build"
- },
- "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0",
- "Microsoft.AspNetCore.Server.Kestrel": "1.1.0",
- "Microsoft.AspNetCore.StaticFiles": "1.1.0",
- "Microsoft.EntityFrameworkCore.SQLite": "1.1.0",
- "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0",
- "Microsoft.Extensions.Configuration.Json": "1.1.0",
- "Microsoft.Extensions.Configuration.CommandLine": "1.1.0",
- "Microsoft.Extensions.Logging": "1.1.0",
- "Microsoft.Extensions.Logging.Console": "1.1.0",
- "Microsoft.Extensions.Logging.Debug": "1.1.0",
- "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0",
- "AutoMapper": "5.0.2"
- },
-
- "tools": {
- "Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final",
- "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final",
- "Microsoft.DotNet.Watcher.Tools": "1.0.0-preview2-final"
- },
-
- "frameworks": {
- "netcoreapp1.1": {
- "imports": [
- "dotnet5.6",
- "portable-net45+win8"
- ]
- }
- },
-
- "publishOptions": {
- "include": [
- "appsettings.json",
- "ClientApp",
- "node_modules",
- "typings",
- "Views",
- "tsconfig.json",
- "tsd.json",
- "web.config",
- "webpack.*.js",
- "wwwroot"
- ]
- },
- "scripts": {
- "prepublish": [
- "npm install",
- "gulp"
- ],
- "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
- }
-}
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+ <PropertyGroup>
+ <TargetFramework>netcoreapp1.1</TargetFramework>
+ <IsPackable>false</IsPackable>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.NodeServices\Microsoft.AspNetCore.NodeServices.csproj" />
+ <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.NodeServices.Sockets\Microsoft.AspNetCore.NodeServices.Sockets.csproj" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="1.1.0" />
+ </ItemGroup>
+
+</Project>
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0.25123" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0.25123</VisualStudioVersion>
- <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
- </PropertyGroup>
- <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
- <PropertyGroup Label="Globals">
- <ProjectGuid>a64af9d9-72aa-4433-be1d-dc2524b6808a</ProjectGuid>
- <RootNamespace>LatencyTest</RootNamespace>
- <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
- <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
- </PropertyGroup>
-
- <PropertyGroup>
- <SchemaVersion>2.0</SchemaVersion>
- </PropertyGroup>
- <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
@@ -1,20 +0,0 @@
-{
- "version": "1.0.0-*",
- "buildOptions": {
- "emitEntryPoint": true
- },
- "dependencies": {
- "Microsoft.NETCore.App": {
- "version": "1.1.0",
- "type": "platform"
- },
- "Microsoft.AspNetCore.NodeServices": "1.1.0-*",
- "Microsoft.AspNetCore.NodeServices.Sockets": "1.1.0-*",
- "Microsoft.Extensions.DependencyInjection": "1.1.0"
- },
- "frameworks": {
- "netcoreapp1.0": {
- "imports": "dnxcore50"
- }
- }
-}
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+ <PropertyGroup>
+ <TargetFramework>netcoreapp1.1</TargetFramework>
+ <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
+ <IsPackable>false</IsPackable>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.NodeServices\Microsoft.AspNetCore.NodeServices.csproj" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Microsoft.AspNetCore" Version="1.1.0" />
+ <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.0" />
+ <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.0" />
+ <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.0" />
+ </ItemGroup>
+
+ <Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
+ <Exec Command="npm install" />
+ </Target>
+
+</Project>
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
- <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
- <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
- </PropertyGroup>
- <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
- <PropertyGroup Label="Globals">
- <ProjectGuid>6d4bcdd6-7951-449b-be55-cb7f014b7430</ProjectGuid>
- <RootNamespace>NodeServicesExamples</RootNamespace>
- <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\JavaScriptServices.sln\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
- <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
- </PropertyGroup>
- <PropertyGroup>
- <SchemaVersion>2.0</SchemaVersion>
- <DevelopmentServerPort>2018</DevelopmentServerPort>
- </PropertyGroup>
- <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
@@ -1,43 +0,0 @@
-{
- "version": "1.0.0-*",
- "tooling": {
- "defaultNamespace": "NodeServicesExamples"
- },
- "buildOptions": {
- "emitEntryPoint": true,
- "preserveCompilationContext": true
- },
- "runtimeOptions": {
- "gcServer": true
- },
- "dependencies": {
- "Microsoft.NETCore.App": {
- "version": "1.1.0",
- "type": "platform"
- },
- "Microsoft.AspNetCore.Diagnostics": "1.1.0",
- "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0",
- "Microsoft.AspNetCore.Mvc": "1.1.0",
- "Microsoft.AspNetCore.Mvc.TagHelpers": "1.1.0",
- "Microsoft.AspNetCore.Server.Kestrel": "1.1.0",
- "Microsoft.AspNetCore.StaticFiles": "1.1.0",
- "Microsoft.Extensions.Configuration.Json": "1.1.0",
- "Microsoft.Extensions.Logging.Console": "1.1.0",
- "Microsoft.Extensions.Logging.Debug": "1.1.0",
- "Microsoft.AspNetCore.NodeServices": "1.1.0-*"
- },
- "frameworks": {
- "netcoreapp1.0": {}
- },
- "publishExclude": [
- "node_modules",
- "bower_components",
- "**.xproj",
- "**.user",
- "**.vspscc"
- ],
- "scripts": {
- "prepublish": [ "npm install" ],
- "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
- }
-}
@@ -1,11 +0,0 @@
-FROM microsoft/aspnet:1.0.0-rc1-update1
-
-RUN printf "deb http://ftp.us.debian.org/debian jessie main\n" >> /etc/apt/sources.list
-RUN apt-get -qq update && apt-get install -qqy sqlite3 libsqlite3-dev && rm -rf /var/lib/apt/lists/*
-
-COPY . /app
-WORKDIR /app
-RUN ["dnu", "restore"]
-
-EXPOSE 5000/tcp
-ENTRYPOINT ["dnx", "-p", "project.json", "web"]
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+ <PropertyGroup>
+ <TargetFramework>netcoreapp1.1</TargetFramework>
+ <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
+ <IsPackable>false</IsPackable>
+ </PropertyGroup>
+
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\src\Microsoft.AspNetCore.SpaServices\Microsoft.AspNetCore.SpaServices.csproj" />
+ </ItemGroup>
+
+ <ItemGroup>
+ <PackageReference Include="Microsoft.AspNetCore" Version="1.1.0" />
+ <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.0" />
+ <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.0" />
+ <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.0" />
+ </ItemGroup>
+
+ <Target Name="PrepublishScript" BeforeTargets="PrepareForPublish">
+ <Exec Command="npm install" />
+ </Target>
+
+</Project>
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
- <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
- <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
- </PropertyGroup>
- <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
- <PropertyGroup Label="Globals">
- <ProjectGuid>a8905301-8492-42fd-9e83-f715a0fdc3a2</ProjectGuid>
- <RootNamespace>Webpack</RootNamespace>
- <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">..\..\..\JavaScriptServices.sln\artifacts\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
- <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
- </PropertyGroup>
- <PropertyGroup>
- <SchemaVersion>2.0</SchemaVersion>
- <DevelopmentServerPort>2018</DevelopmentServerPort>
- </PropertyGroup>
- <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
Oops, something went wrong.

0 comments on commit a79bc75

Please sign in to comment.