Merge pull request #1 from AlexEndris/Develop

Fixes so Appveyor works
AlexEndris · May 24, 2015 · bed6872 · bed6872
2 parents 898ca54 + fe7525b
commit bed6872
Show file tree

Hide file tree

Showing 18 changed files with 167 additions and 202 deletions.
diff --git a/GeneratedTestingAssembly.Tests/GeneratedTestingAssembly.Tests.csproj b/GeneratedTestingAssembly.Tests/GeneratedTestingAssembly.Tests.csproj
@@ -158,7 +158,7 @@
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
-  <Import Project="$(SolutionDir)\RosMockLyn.Build\bin\Debug\RosMockLyn.targets" />
+  <Import Project="$(SolutionDir)\bin\Debug\RosMockLyn.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>

diff --git a/NuGet/NuGet.csproj b/NuGet/NuGet.csproj
@@ -26,40 +26,40 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
-  	<PropertyGroup>
-        <NuGetCmd Condition="$(NuGetCmd) == '' Or $(NuGetCmd) == '*Undefined*'">$(SolutionDir).nuget\NuGet.exe</NuGetCmd>
-        <NuGetOutput Condition="$(NuGetOutput) == '' Or $(NuGetOutput) == '*Undefined*'">$(SolutionDir)bin\NuGet</NuGetOutput>
-		<NuGetPackageTemp Condition="$(NuGetPackageTemp) == '' Or $(NuGetPackageTemp) == '*Undefined*'">$(NuGetOutput)\Temp\</NuGetPackageTemp>
-        <NuGetPackageTempLib Condition="$(NuGetPackageTempLib) == '' Or $(NuGetPackageTempLib) == '*Undefined*'">$(NuGetPackageTemp)lib\</NuGetPackageTempLib>
-        <NuGetPackageTempBuild Condition="$(NuGetPackageTempBuild) == '' Or $(NuGetPackageTempBuild) == '*Undefined*'">$(NuGetPackageTemp)build\</NuGetPackageTempBuild>
-        <NuSpecFileName Condition="$(NuSpecFileName) == '' Or $(NuSpecFileName) == '*Undefined*'">$(NuGetPackageTemp)RosMockLyn.nuspec</NuSpecFileName>
-        <RosMockLynBuildOutput Condition="$(RosMockLynBuildOutput) == '' Or $(RosMockLynBuildOutput) == '*Undefined*'">$(SolutionDir)bin\Build\$(Configuration)\</RosMockLynBuildOutput>
-        <RosMockLynMockingOutput Condition="$(RosMockLynMockingOutput) == '' Or $(RosMockLynMockingOutput) == '*Undefined*'">$(SolutionDir)bin\Mocking\$(Configuration)\</RosMockLynMockingOutput>
-	</PropertyGroup>
+  <PropertyGroup>
+    <NuGetCmd Condition="$(NuGetCmd) == '' Or $(NuGetCmd) == '*Undefined*'">$(SolutionDir).nuget\NuGet.exe</NuGetCmd>
+    <NuGetOutput Condition="$(NuGetOutput) == '' Or $(NuGetOutput) == '*Undefined*'">$(SolutionDir)bin\NuGet</NuGetOutput>
+    <NuGetPackageTemp Condition="$(NuGetPackageTemp) == '' Or $(NuGetPackageTemp) == '*Undefined*'">$(NuGetOutput)\Temp\</NuGetPackageTemp>
+    <NuGetPackageTempLib Condition="$(NuGetPackageTempLib) == '' Or $(NuGetPackageTempLib) == '*Undefined*'">$(NuGetPackageTemp)lib\</NuGetPackageTempLib>
+    <NuGetPackageTempBuild Condition="$(NuGetPackageTempBuild) == '' Or $(NuGetPackageTempBuild) == '*Undefined*'">$(NuGetPackageTemp)build\</NuGetPackageTempBuild>
+    <NuSpecFileName Condition="$(NuSpecFileName) == '' Or $(NuSpecFileName) == '*Undefined*'">$(NuGetPackageTemp)RosMockLyn.nuspec</NuSpecFileName>
+    <RosMockLynBuildOutput Condition="$(RosMockLynBuildOutput) == '' Or $(RosMockLynBuildOutput) == '*Undefined*'">$(SolutionDir)bin\Build\$(Configuration)\</RosMockLynBuildOutput>
+    <RosMockLynMockingOutput Condition="$(RosMockLynMockingOutput) == '' Or $(RosMockLynMockingOutput) == '*Undefined*'">$(SolutionDir)bin\Mocking\$(Configuration)\</RosMockLynMockingOutput>
+  </PropertyGroup>
   <Target Name="Clean">
     <RemoveDir Directories="$(NuGetOutput)" />
   </Target>
   <Target Name="Build" DependsOnTargets="NuGetBuild" />
   <Target Name="ReBuild" DependsOnTargets="NuGetBuild" />
   <Target Name="NuGetBuild" DependsOnTargets="Clean">
-	<ItemGroup>
-		<Directories Include="$(NuGetOutput)\" />
-		<Directories Include="$(NuGetPackageTemp)" />
-		<Directories Include="$(NuGetPackageTempLib)" />
-		<Directories Include="$(NuGetPackageTempBuild)" />
-	</ItemGroup>
-	<ItemGroup>
-		<FilesToCopy Include="$(RosMockLynBuildOutput)*.*" Exclude="*.targets"/>
-		<FilesToCopy Include="$(RosMockLynMockingOutput)*.*" />
-		<BuildTargetsFile Include="$(RosMockLynBuildOutput)*.targets" />
-		<NuSpecFile Include="$(ProjectDir)RosMockLyn.nuspec" />
-	</ItemGroup>
-    <MakeDir Directories="@(Directories) "/>
-	<Copy SourceFiles="@(FilesToCopy)" DestinationFolder="$(NuGetPackageTempLib)" />
-	<Copy SourceFiles="@(BuildTargetsFile)" DestinationFolder="$(NuGetPackageTempBuild)" />
-	<Copy SourceFiles="@(NuSpecFile)" DestinationFolder="$(NuGetPackageTemp)" />
-	<Exec WorkingDirectory="$(NuGetPackageTemp)" Command="&quot;$(NuGetCmd)&quot; pack &quot;$(NuSpecFileName)&quot; -OutputDirectory &quot;$(NuGetOutput)&quot; -Verbosity normal" />
-	<RemoveDir Directories="$(NuGetPackageTemp)" />
+    <ItemGroup>
+      <Directories Include="$(NuGetOutput)\" />
+      <Directories Include="$(NuGetPackageTemp)" />
+      <Directories Include="$(NuGetPackageTempLib)" />
+      <Directories Include="$(NuGetPackageTempBuild)" />
+    </ItemGroup>
+    <ItemGroup>
+      <FilesToCopy Include="$(RosMockLynBuildOutput)*.*" Exclude="*.targets" />
+      <FilesToCopy Include="$(RosMockLynMockingOutput)*.*" />
+      <BuildTargetsFile Include="$(RosMockLynBuildOutput)*.targets" />
+      <NuSpecFile Include="$(ProjectDir)RosMockLyn.nuspec" />
+    </ItemGroup>
+    <MakeDir Directories="@(Directories) " />
+    <Copy SourceFiles="@(FilesToCopy)" DestinationFolder="$(NuGetPackageTempLib)" />
+    <Copy SourceFiles="@(BuildTargetsFile)" DestinationFolder="$(NuGetPackageTempBuild)" />
+    <Copy SourceFiles="@(NuSpecFile)" DestinationFolder="$(NuGetPackageTemp)" />
+    <Exec WorkingDirectory="$(NuGetPackageTemp)" Command="&quot;$(NuGetCmd)&quot; pack &quot;$(NuSpecFileName)&quot; -OutputDirectory &quot;$(NuGetOutput)&quot; -Verbosity normal" />
+    <RemoveDir Directories="$(NuGetPackageTemp)" />
   </Target>
   <ItemGroup>
     <ProjectReference Include="..\RosMockLyn.Build\RosMockLyn.Build.csproj">

diff --git a/README.md b/README.md
@@ -0,0 +1,4 @@
+# RosMockLyn [![Build status](https://ci.appveyor.com/api/projects/status/github/AlexEndris/RosMockLyn)](https://ci.appveyor.com/api/projects/status/github/AlexEndris/RosMockLyn)
+Compile-time mocking framework for ModernUI and Windows Phone apps.
+
+Coming soon
diff --git a/RosMockLyn.Build/RosMockLyn.Build.csproj b/RosMockLyn.Build/RosMockLyn.Build.csproj
@@ -44,45 +44,51 @@
     <Reference Include="Microsoft.Build.Utilities.v4.0" />
     <Reference Include="Microsoft.CodeAnalysis, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
+      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CodeAnalysis.CSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
+      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.CSharp.Desktop">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Desktop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.Desktop.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop">
-      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop.dll</HintPath>
+    <Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.Workspaces.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.CSharp.Workspaces.Desktop.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CodeAnalysis.Desktop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath>
+      <HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Desktop.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CodeAnalysis.Workspaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
+      <HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Workspaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CodeAnalysis.Workspaces.Desktop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc1\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath>
+      <HintPath>..\packages\Microsoft.CodeAnalysis.Workspaces.Common.1.0.0-rc2\lib\net45\Microsoft.CodeAnalysis.Workspaces.Desktop.dll</HintPath>
     </Reference>
-    <Reference Include="Mono.Cecil, Version=0.9.5.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+    <Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Mono.Cecil.0.9.5.4\lib\net40\Mono.Cecil.dll</HintPath>
+      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll</HintPath>
     </Reference>
-    <Reference Include="Mono.Cecil.Mdb">
-      <HintPath>..\packages\Mono.Cecil.0.9.5.4\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
+    <Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
     </Reference>
-    <Reference Include="Mono.Cecil.Pdb">
-      <HintPath>..\packages\Mono.Cecil.0.9.5.4\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
+    <Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
     </Reference>
-    <Reference Include="Mono.Cecil.Rocks">
-      <HintPath>..\packages\Mono.Cecil.0.9.5.4\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
+    <Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Collections.Immutable, Version=1.1.33.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

diff --git a/RosMockLyn.Build/packages.config b/RosMockLyn.Build/packages.config
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Autofac" version="3.5.2" targetFramework="net451" />
-  <package id="Microsoft.CodeAnalysis.Analyzers" version="1.0.0-rc1" targetFramework="net451" />
-  <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc1" targetFramework="net451" />
-  <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0-rc1" targetFramework="net451" />
-  <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0-rc1" targetFramework="net451" />
-  <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0-rc1" targetFramework="net451" />
+  <package id="Microsoft.CodeAnalysis.Analyzers" version="1.0.0-rc2" targetFramework="net451" />
+  <package id="Microsoft.CodeAnalysis.Common" version="1.0.0-rc2" targetFramework="net451" />
+  <package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0-rc2" targetFramework="net451" />
+  <package id="Microsoft.CodeAnalysis.CSharp.Workspaces" version="1.0.0-rc2" targetFramework="net451" />
+  <package id="Microsoft.CodeAnalysis.Workspaces.Common" version="1.0.0-rc2" targetFramework="net451" />
   <package id="Microsoft.Composition" version="1.0.30" targetFramework="net451" />
-  <package id="Mono.Cecil" version="0.9.5.4" targetFramework="net451" />
+  <package id="Mono.Cecil" version="0.9.6.1" targetFramework="net451" />
   <package id="System.Collections.Immutable" version="1.1.33-beta" targetFramework="net451" />
   <package id="System.Reflection.Metadata" version="1.0.18-beta" targetFramework="net451" />
 </packages>