Skip to content
Browse files

Move Sample.MvcIntegration under the sample folder

  • Loading branch information...
1 parent 70a0c63 commit b6cebe8e61974048a3424a1c7618fb98ac769a43 @fitzchak fitzchak committed
Showing with 17 additions and 160 deletions.
  1. +12 −0 Raven.Samples.sln
  2. +0 −6 Samples/.nuget/NuGet.Config
  3. BIN Samples/.nuget/NuGet.exe
  4. +0 −150 Samples/.nuget/NuGet.targets
  5. +0 −3 Samples/NuGet.config
  6. +3 −0 Samples/Raven.Sample.Failover/Raven.Sample.Failover.csproj
  7. 0 { → Samples}/Raven.Sample.MvcIntegration/App_Start/RouteConfig.cs
  8. 0 { → Samples}/Raven.Sample.MvcIntegration/App_Start/WebApiConfig.cs
  9. 0 { → Samples}/Raven.Sample.MvcIntegration/Content/Site.css
  10. 0 { → Samples}/Raven.Sample.MvcIntegration/Content/bootstrap.css
  11. 0 { → Samples}/Raven.Sample.MvcIntegration/Controllers/HomeController.cs
  12. 0 { → Samples}/Raven.Sample.MvcIntegration/Controllers/ValuesController.cs
  13. 0 { → Samples}/Raven.Sample.MvcIntegration/Global.asax
  14. 0 { → Samples}/Raven.Sample.MvcIntegration/Global.asax.cs
  15. 0 { → Samples}/Raven.Sample.MvcIntegration/Models/TodoItem.cs
  16. +1 −1 { → Samples}/Raven.Sample.MvcIntegration/Raven.Sample.MvcIntegration.csproj
  17. 0 { → Samples}/Raven.Sample.MvcIntegration/Views/Home/Index.cshtml
  18. 0 { → Samples}/Raven.Sample.MvcIntegration/Views/Shared/_Layout.cshtml
  19. 0 { → Samples}/Raven.Sample.MvcIntegration/Views/Web.config
  20. 0 { → Samples}/Raven.Sample.MvcIntegration/Views/_ViewStart.cshtml
  21. 0 { → Samples}/Raven.Sample.MvcIntegration/Web.Debug.config
  22. 0 { → Samples}/Raven.Sample.MvcIntegration/Web.Release.config
  23. 0 { → Samples}/Raven.Sample.MvcIntegration/Web.config
  24. 0 { → Samples}/Raven.Sample.MvcIntegration/packages.config
  25. +1 −0 packages/repositories.config
View
12 Raven.Samples.sln
@@ -53,6 +53,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Bundles", "Bundles", "{0B41
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Raven.Bundles.IndexReplication", "Bundles\Raven.Bundles.IndexReplication\Raven.Bundles.IndexReplication.csproj", "{2728BBA7-5142-445E-BAA5-142A25E0666D}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Raven.Sample.MvcIntegration", "Samples\Raven.Sample.MvcIntegration\Raven.Sample.MvcIntegration.csproj", "{8F299EBD-BBFE-4939-ADD0-F2CCBC6E7C57}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -273,6 +275,16 @@ Global
{2728BBA7-5142-445E-BAA5-142A25E0666D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{2728BBA7-5142-445E-BAA5-142A25E0666D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{2728BBA7-5142-445E-BAA5-142A25E0666D}.Release|x86.ActiveCfg = Release|Any CPU
+ {8F299EBD-BBFE-4939-ADD0-F2CCBC6E7C57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8F299EBD-BBFE-4939-ADD0-F2CCBC6E7C57}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8F299EBD-BBFE-4939-ADD0-F2CCBC6E7C57}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {8F299EBD-BBFE-4939-ADD0-F2CCBC6E7C57}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {8F299EBD-BBFE-4939-ADD0-F2CCBC6E7C57}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {8F299EBD-BBFE-4939-ADD0-F2CCBC6E7C57}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8F299EBD-BBFE-4939-ADD0-F2CCBC6E7C57}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8F299EBD-BBFE-4939-ADD0-F2CCBC6E7C57}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {8F299EBD-BBFE-4939-ADD0-F2CCBC6E7C57}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {8F299EBD-BBFE-4939-ADD0-F2CCBC6E7C57}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
View
6 Samples/.nuget/NuGet.Config
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
- <solution>
- <add key="disableSourceControlIntegration" value="true" />
- </solution>
-</configuration>
View
BIN Samples/.nuget/NuGet.exe
Binary file not shown.
View
150 Samples/.nuget/NuGet.targets
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
-
- <!-- Enable the restore command to run before builds -->
- <RestorePackages Condition=" '$(RestorePackages)' == '' ">false</RestorePackages>
-
- <!-- Property that enables building a package from a project -->
- <BuildPackage Condition=" '$(BuildPackage)' == '' ">false</BuildPackage>
-
- <!-- Determines if package restore consent is required to restore packages -->
- <RequireRestoreConsent Condition=" '$(RequireRestoreConsent)' != 'false' ">true</RequireRestoreConsent>
-
- <!-- Download NuGet.exe if it does not already exist -->
- <DownloadNuGetExe Condition=" '$(DownloadNuGetExe)' == '' ">false</DownloadNuGetExe>
- </PropertyGroup>
-
- <ItemGroup Condition=" '$(PackageSources)' == '' ">
- <!-- Package sources used to restore packages. By default will used the registered sources under %APPDATA%\NuGet\NuGet.Config -->
- <!--
- <PackageSource Include="https://nuget.org/api/v2/" />
- <PackageSource Include="https://my-nuget-source/nuget/" />
- -->
- </ItemGroup>
-
- <PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
- <!-- Windows specific commands -->
- <NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
- <PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
- </PropertyGroup>
-
- <PropertyGroup Condition=" '$(OS)' != 'Windows_NT'">
- <!-- We need to launch nuget.exe with the mono command if we're not on windows -->
- <NuGetToolsPath>$(SolutionDir).nuget</NuGetToolsPath>
- <PackagesConfig>packages.config</PackagesConfig>
- </PropertyGroup>
-
- <PropertyGroup>
- <!-- NuGet command -->
- <NuGetExePath Condition=" '$(NuGetExePath)' == '' ">$(NuGetToolsPath)\nuget.exe</NuGetExePath>
- <PackageSources Condition=" $(PackageSources) == '' ">@(PackageSource)</PackageSources>
-
- <NuGetCommand Condition=" '$(OS)' == 'Windows_NT'">"$(NuGetExePath)"</NuGetCommand>
- <NuGetCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(NuGetExePath)</NuGetCommand>
-
- <PackageOutputDir Condition="$(PackageOutputDir) == ''">$(TargetDir.Trim('\\'))</PackageOutputDir>
-
- <RequireConsentSwitch Condition=" $(RequireRestoreConsent) == 'true' ">-RequireConsent</RequireConsentSwitch>
- <!-- Commands -->
- <RestoreCommand>$(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(RequireConsentSwitch) -solutionDir "$(SolutionDir) "</RestoreCommand>
- <BuildCommand>$(NuGetCommand) pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)" -symbols</BuildCommand>
-
- <!-- We need to ensure packages are restored prior to assembly resolve -->
- <ResolveReferencesDependsOn Condition="$(RestorePackages) == 'true'">
- RestorePackages;
- $(ResolveReferencesDependsOn);
- </ResolveReferencesDependsOn>
-
- <!-- Make the build depend on restore packages -->
- <BuildDependsOn Condition="$(BuildPackage) == 'true'">
- $(BuildDependsOn);
- BuildPackage;
- </BuildDependsOn>
- </PropertyGroup>
-
- <Target Name="CheckPrerequisites">
- <!-- Raise an error if we're unable to locate nuget.exe -->
- <Error Condition="'$(DownloadNuGetExe)' != 'true' AND !Exists('$(NuGetExePath)')" Text="Unable to locate '$(NuGetExePath)'" />
- <SetEnvironmentVariable EnvKey="VisualStudioVersion" EnvValue="$(VisualStudioVersion)" Condition=" '$(VisualStudioVersion)' != '' AND '$(OS)' == 'Windows_NT' " />
- <!--
- Take advantage of MsBuild's build dependency tracking to make sure that we only ever download nuget.exe once.
- This effectively acts as a lock that makes sure that the download operation will only happen once and all
- parallel builds will have to wait for it to complete.
- -->
- <MsBuild Targets="_DownloadNuGet" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT" />
- </Target>
-
- <Target Name="_DownloadNuGet">
- <DownloadNuGet OutputFilename="$(NuGetExePath)" Condition=" '$(DownloadNuGetExe)' == 'true' AND !Exists('$(NuGetExePath)')" />
- </Target>
-
- <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites">
- <Exec Command="$(RestoreCommand)"
- Condition="'$(OS)' != 'Windows_NT' And Exists('$(PackagesConfig)')" />
-
- <Exec Command="$(RestoreCommand)"
- LogStandardErrorAsError="true"
- Condition="'$(OS)' == 'Windows_NT' And Exists('$(PackagesConfig)')" />
- </Target>
-
- <Target Name="BuildPackage" DependsOnTargets="CheckPrerequisites">
- <Exec Command="$(BuildCommand)"
- Condition=" '$(OS)' != 'Windows_NT' " />
-
- <Exec Command="$(BuildCommand)"
- LogStandardErrorAsError="true"
- Condition=" '$(OS)' == 'Windows_NT' " />
- </Target>
-
- <UsingTask TaskName="DownloadNuGet" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
- <ParameterGroup>
- <OutputFilename ParameterType="System.String" Required="true" />
- </ParameterGroup>
- <Task>
- <Reference Include="System.Core" />
- <Using Namespace="System" />
- <Using Namespace="System.IO" />
- <Using Namespace="System.Net" />
- <Using Namespace="Microsoft.Build.Framework" />
- <Using Namespace="Microsoft.Build.Utilities" />
- <Code Type="Fragment" Language="cs">
- <![CDATA[
- try {
- OutputFilename = Path.GetFullPath(OutputFilename);
-
- Log.LogMessage("Downloading latest version of NuGet.exe...");
- WebClient webClient = new WebClient();
- webClient.DownloadFile("https://nuget.org/nuget.exe", OutputFilename);
-
- return true;
- }
- catch (Exception ex) {
- Log.LogErrorFromException(ex);
- return false;
- }
- ]]>
- </Code>
- </Task>
- </UsingTask>
-
- <UsingTask TaskName="SetEnvironmentVariable" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
- <ParameterGroup>
- <EnvKey ParameterType="System.String" Required="true" />
- <EnvValue ParameterType="System.String" Required="true" />
- </ParameterGroup>
- <Task>
- <Using Namespace="System" />
- <Code Type="Fragment" Language="cs">
- <![CDATA[
- try {
- Environment.SetEnvironmentVariable(EnvKey, EnvValue, System.EnvironmentVariableTarget.Process);
- }
- catch {
- }
- ]]>
- </Code>
- </Task>
- </UsingTask>
-</Project>
View
3 Samples/NuGet.config
@@ -1,3 +0,0 @@
-<settings>
- <repositoryPath>..\Packages</repositoryPath>
-</settings>
View
3 Samples/Raven.Sample.Failover/Raven.Sample.Failover.csproj
@@ -13,6 +13,8 @@
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
@@ -65,6 +67,7 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildProjectDirectory)\..\..\Tools\StyleCop\StyleCop.Targets" Condition="Exists('$(MSBuildProjectDirectory)\..\..\Tools\StyleCop\StyleCop.Targets')" />
+ <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
View
0 ...e.MvcIntegration/App_Start/RouteConfig.cs → ...e.MvcIntegration/App_Start/RouteConfig.cs
File renamed without changes.
View
0 ....MvcIntegration/App_Start/WebApiConfig.cs → ....MvcIntegration/App_Start/WebApiConfig.cs
File renamed without changes.
View
0 Raven.Sample.MvcIntegration/Content/Site.css → ...en.Sample.MvcIntegration/Content/Site.css
File renamed without changes.
View
0 ...mple.MvcIntegration/Content/bootstrap.css → ...mple.MvcIntegration/Content/bootstrap.css
File renamed without changes.
View
0 ...Integration/Controllers/HomeController.cs → ...Integration/Controllers/HomeController.cs
File renamed without changes.
View
0 ...tegration/Controllers/ValuesController.cs → ...tegration/Controllers/ValuesController.cs
File renamed without changes.
View
0 Raven.Sample.MvcIntegration/Global.asax → ...s/Raven.Sample.MvcIntegration/Global.asax
File renamed without changes.
View
0 Raven.Sample.MvcIntegration/Global.asax.cs → ...aven.Sample.MvcIntegration/Global.asax.cs
File renamed without changes.
View
0 ....Sample.MvcIntegration/Models/TodoItem.cs → ....Sample.MvcIntegration/Models/TodoItem.cs
File renamed without changes.
View
2 ...ration/Raven.Sample.MvcIntegration.csproj → ...ration/Raven.Sample.MvcIntegration.csproj
@@ -140,7 +140,7 @@
<Content Include="packages.config" />
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\Raven.Client.Lightweight\Raven.Client.Lightweight.csproj">
+ <ProjectReference Include="..\..\Raven.Client.Lightweight\Raven.Client.Lightweight.csproj">
<Project>{4E087ECB-E7CA-4891-AC3C-3C76702715B6}</Project>
<Name>Raven.Client.Lightweight</Name>
</ProjectReference>
View
0 ...le.MvcIntegration/Views/Home/Index.cshtml → ...le.MvcIntegration/Views/Home/Index.cshtml
File renamed without changes.
View
0 ...vcIntegration/Views/Shared/_Layout.cshtml → ...vcIntegration/Views/Shared/_Layout.cshtml
File renamed without changes.
View
0 Raven.Sample.MvcIntegration/Views/Web.config → ...en.Sample.MvcIntegration/Views/Web.config
File renamed without changes.
View
0 ...le.MvcIntegration/Views/_ViewStart.cshtml → ...le.MvcIntegration/Views/_ViewStart.cshtml
File renamed without changes.
View
0 Raven.Sample.MvcIntegration/Web.Debug.config → ...en.Sample.MvcIntegration/Web.Debug.config
File renamed without changes.
View
0 ....Sample.MvcIntegration/Web.Release.config → ....Sample.MvcIntegration/Web.Release.config
File renamed without changes.
View
0 Raven.Sample.MvcIntegration/Web.config → ...es/Raven.Sample.MvcIntegration/Web.config
File renamed without changes.
View
0 Raven.Sample.MvcIntegration/packages.config → ...ven.Sample.MvcIntegration/packages.config
File renamed without changes.
View
1 packages/repositories.config
@@ -15,4 +15,5 @@
<repository path="..\Raven.Tryouts\packages.config" />
<repository path="..\Raven.Web\packages.config" />
<repository path="..\Samples\Raven.Sample.Failover\packages.config" />
+ <repository path="..\Samples\Raven.Sample.MvcIntegration\packages.config" />
</repositories>

0 comments on commit b6cebe8

Please sign in to comment.
Something went wrong with that request. Please try again.