Skip to content

Commit

Permalink
Update csproj files (#646)
Browse files Browse the repository at this point in the history
  • Loading branch information
jtkech authored and sebastienros committed Apr 6, 2017
1 parent 948e20d commit 991b785
Show file tree
Hide file tree
Showing 126 changed files with 449 additions and 1,150 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ build/
/buildtasks
/artifacts
*.sln.cache
src/Orchard.Web/Media/*
src/OrchardCore.Modules/**/launchSettings.json
src/OrchardCore.Themes/**/launchSettings.json
log.xml
profiling/
*.orig
Expand Down
55 changes: 55 additions & 0 deletions Orchard.sln
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,24 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orchard.OpenId", "src\Orcha
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Orchard.ResponseCache", "src\OrchardCore.Modules\Orchard.ResponseCache\Orchard.ResponseCache.csproj", "{A4A2B921-9A08-4462-8C62-D5EDF078E72D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.AsBundle", "src\OrchardCore\OrchardCore.AsBundle\OrchardCore.AsBundle.csproj", "{A2FA03DC-8FD0-4820-879D-6F08B323C797}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.AsModule", "src\OrchardCore\OrchardCore.AsModule\OrchardCore.AsModule.csproj", "{74EEC630-9740-40BF-A6CF-2E0B95AA6DE1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.AsTheme", "src\OrchardCore\OrchardCore.AsTheme\OrchardCore.AsTheme.csproj", "{06139E4B-C94D-4090-95AB-C6E137BE9756}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Cms", "src\OrchardCore\OrchardCore.Cms\OrchardCore.Cms.csproj", "{2B34D23B-1D69-46FE-B695-930AA3C0956B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Modules", "src\OrchardCore\OrchardCore.Modules\OrchardCore.Modules.csproj", "{376514C6-CB04-41F4-9B6C-5335C0FFCB0E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Modules.Mvc", "src\OrchardCore\OrchardCore.Modules.Mvc\OrchardCore.Modules.Mvc.csproj", "{3A7AD5EC-D3E4-4C3F-B192-25804BB53C8E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Modules.Nancy", "src\OrchardCore\OrchardCore.Modules.Nancy\OrchardCore.Modules.Nancy.csproj", "{3657478C-3BAE-4563-9C08-63A8C64A7CB6}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Bundles", "Bundles", "{44E4D150-C374-4353-8BA7-8C575704D13E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Aspects", "Aspects", "{3398AB60-2DB7-464C-B211-C4120BE75582}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -641,6 +659,34 @@ Global
{A4A2B921-9A08-4462-8C62-D5EDF078E72D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A4A2B921-9A08-4462-8C62-D5EDF078E72D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A4A2B921-9A08-4462-8C62-D5EDF078E72D}.Release|Any CPU.Build.0 = Release|Any CPU
{A2FA03DC-8FD0-4820-879D-6F08B323C797}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A2FA03DC-8FD0-4820-879D-6F08B323C797}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A2FA03DC-8FD0-4820-879D-6F08B323C797}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A2FA03DC-8FD0-4820-879D-6F08B323C797}.Release|Any CPU.Build.0 = Release|Any CPU
{74EEC630-9740-40BF-A6CF-2E0B95AA6DE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{74EEC630-9740-40BF-A6CF-2E0B95AA6DE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{74EEC630-9740-40BF-A6CF-2E0B95AA6DE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{74EEC630-9740-40BF-A6CF-2E0B95AA6DE1}.Release|Any CPU.Build.0 = Release|Any CPU
{06139E4B-C94D-4090-95AB-C6E137BE9756}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{06139E4B-C94D-4090-95AB-C6E137BE9756}.Debug|Any CPU.Build.0 = Debug|Any CPU
{06139E4B-C94D-4090-95AB-C6E137BE9756}.Release|Any CPU.ActiveCfg = Release|Any CPU
{06139E4B-C94D-4090-95AB-C6E137BE9756}.Release|Any CPU.Build.0 = Release|Any CPU
{2B34D23B-1D69-46FE-B695-930AA3C0956B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2B34D23B-1D69-46FE-B695-930AA3C0956B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2B34D23B-1D69-46FE-B695-930AA3C0956B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2B34D23B-1D69-46FE-B695-930AA3C0956B}.Release|Any CPU.Build.0 = Release|Any CPU
{376514C6-CB04-41F4-9B6C-5335C0FFCB0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{376514C6-CB04-41F4-9B6C-5335C0FFCB0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{376514C6-CB04-41F4-9B6C-5335C0FFCB0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{376514C6-CB04-41F4-9B6C-5335C0FFCB0E}.Release|Any CPU.Build.0 = Release|Any CPU
{3A7AD5EC-D3E4-4C3F-B192-25804BB53C8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3A7AD5EC-D3E4-4C3F-B192-25804BB53C8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3A7AD5EC-D3E4-4C3F-B192-25804BB53C8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3A7AD5EC-D3E4-4C3F-B192-25804BB53C8E}.Release|Any CPU.Build.0 = Release|Any CPU
{3657478C-3BAE-4563-9C08-63A8C64A7CB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3657478C-3BAE-4563-9C08-63A8C64A7CB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3657478C-3BAE-4563-9C08-63A8C64A7CB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3657478C-3BAE-4563-9C08-63A8C64A7CB6}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -758,5 +804,14 @@ Global
{B2CD782C-18A5-433C-A779-543A434760E0} = {D1EC1E7A-8233-4527-A79E-B6ECE9DBB469}
{A02A9CF9-5681-44BA-986D-F100D0A51495} = {A066395F-6F73-45DC-B5A6-B4E306110DCE}
{A4A2B921-9A08-4462-8C62-D5EDF078E72D} = {A066395F-6F73-45DC-B5A6-B4E306110DCE}
{A2FA03DC-8FD0-4820-879D-6F08B323C797} = {3398AB60-2DB7-464C-B211-C4120BE75582}
{74EEC630-9740-40BF-A6CF-2E0B95AA6DE1} = {3398AB60-2DB7-464C-B211-C4120BE75582}
{06139E4B-C94D-4090-95AB-C6E137BE9756} = {3398AB60-2DB7-464C-B211-C4120BE75582}
{2B34D23B-1D69-46FE-B695-930AA3C0956B} = {44E4D150-C374-4353-8BA7-8C575704D13E}
{376514C6-CB04-41F4-9B6C-5335C0FFCB0E} = {44E4D150-C374-4353-8BA7-8C575704D13E}
{3A7AD5EC-D3E4-4C3F-B192-25804BB53C8E} = {44E4D150-C374-4353-8BA7-8C575704D13E}
{3657478C-3BAE-4563-9C08-63A8C64A7CB6} = {44E4D150-C374-4353-8BA7-8C575704D13E}
{44E4D150-C374-4353-8BA7-8C575704D13E} = {275E087F-A4E2-4A7B-A924-ED68E3A52086}
{3398AB60-2DB7-464C-B211-C4120BE75582} = {275E087F-A4E2-4A7B-A924-ED68E3A52086}
EndGlobalSection
EndGlobal
18 changes: 14 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,29 @@
image: Visual Studio 2017
environment:
nodejs_version: "6.9.1"

# Install scripts. (runs after repo cloning)
install:
# Get the latest stable version of Node.js or io.js
- ps: Install-Product node $env:nodejs_version

- ps: $env:BuildNumber= $env:APPVEYOR_BUILD_NUMBER
init:
- git config --global core.autocrlf true
build_script:
- dotnet restore
- dotnet build
- dotnet build -c Release
- dotnet pack -c Release
test_script:
- ps: .\scripts\run-tests.ps1
clone_depth: 1
test: on
deploy: off
artifacts:
- path: '**\*.nupkg'
deploy:
on:
branch: master
provider: NuGet
server: https://www.myget.org/F/orchardcore-preview/api/v2/package
api_key:
secure: 7PQvuxXn5P39X5QDlDKWbNpOKJKivpqkq7umakIirAZ12CSTAiCwjtJhSBGVboPm
skip_symbols: true
artifact: /.*\.nupkg/
8 changes: 4 additions & 4 deletions pack.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@ dotnet pack "src\OrchardCore.Themes\TheAdmin" -c Release -o "%curpath%\artifacts
dotnet pack "src\OrchardCore.Themes\TheBlogTheme" -c Release -o "%curpath%\artifacts\Extensions"
dotnet pack "src\OrchardCore.Themes\TheTheme" -c Release -o "%curpath%\artifacts\Extensions"

dotnet pack "src\Bundles\OrchardCore.Cms" -c Release -o "%curpath%\artifacts\Bundles"
dotnet pack "src\Bundles\OrchardCore.Modules" -c Release -o "%curpath%\artifacts\Bundles"
dotnet pack "src\Bundles\OrchardCore.Modules.Mvc" -c Release -o "%curpath%\artifacts\Bundles"
dotnet pack "src\Bundles\OrchardCore.Modules.Nancy" -c Release -o "%curpath%\artifacts\Bundles"
dotnet pack "src\OrchardCore\OrchardCore.Cms" -c Release -o "%curpath%\artifacts\Bundles"
dotnet pack "src\OrchardCore\OrchardCore.Modules" -c Release -o "%curpath%\artifacts\Bundles"
dotnet pack "src\OrchardCore\OrchardCore.Modules.Mvc" -c Release -o "%curpath%\artifacts\Bundles"
dotnet pack "src\OrchardCore\OrchardCore.Modules.Nancy" -c Release -o "%curpath%\artifacts\Bundles"

dotnet pack "src\OrchardCore\OrchardCore.AsBundle" -c Release -o "%curpath%\artifacts\Aspects"
dotnet pack "src\OrchardCore\OrchardCore.AsModule" -c Release -o "%curpath%\artifacts\Aspects"
Expand Down
58 changes: 0 additions & 58 deletions src/Bundles/Orchard.Bundles.sln

This file was deleted.

59 changes: 0 additions & 59 deletions src/Bundles/OrchardCore.Cms/OrchardCore.Cms.csproj

This file was deleted.

14 changes: 0 additions & 14 deletions src/Bundles/OrchardCore.Modules.Mvc/OrchardCore.Modules.Mvc.csproj

This file was deleted.

This file was deleted.

14 changes: 0 additions & 14 deletions src/Bundles/OrchardCore.Modules/OrchardCore.Modules.csproj

This file was deleted.

Loading

0 comments on commit 991b785

Please sign in to comment.