moq · kzu · Mar 11, 2018 · Feb 2, 2018 · Mar 11, 2018 · Mar 11, 2018
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .nuget
 .vs
+.idea
 out
 bin
 obj

diff --git a/NuGet.Config b/NuGet.Config
@@ -3,6 +3,8 @@
 	<packageSources>
 		<clear />
 		<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="nugetizer" value="https://ci.appveyor.com/nuget/nugetizer3000" />
 		<add key="offline" value="%userprofile%\.nuget\packages" />
+		<add key="local" value="%temp%\packages" />
 	</packageSources>
-</configuration>
+</configuration>
diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
 # moq
+
 The most popular and friendly mocking framework for .NET
 
 [![Build status](https://ci.appveyor.com/api/projects/status/cm308wecf8ekyv33/branch/master?svg=true)](https://ci.appveyor.com/project/MobileEssentials/moq/branch/master)

diff --git a/build.proj b/build.proj
@@ -76,7 +76,12 @@
   <!-- Performs a Clean, followed by Restore and Build. -->
 	<Target Name="Rebuild" DependsOnTargets="Clean;Restore;Build" />
 
-	<Target Name="_Restore" AfterTargets="Restore">
+  <Target Name="_BeforeRestore" BeforeTargets="Restore">
+    <!-- Since our NuGet.config declares this as a source, the folder must exist before restore -->
+    <MakeDir Directories="$(TEMP)\packages" Condition="!Exists('$(TEMP)\packages')" />
+  </Target>
+
+  <Target Name="_AfterRestore" AfterTargets="Restore">
 		<MSBuild Projects="@(Solution)" Targets="Restore" />
 	</Target>
 

diff --git a/src/Moq.sln b/src/Moq.sln
@@ -13,6 +13,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
 		GitInfo.txt = GitInfo.txt
+		..\NuGet.Config = ..\NuGet.Config
+		..\README.md = ..\README.md
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stunts", "Stunts\Stunts\Stunts.csproj", "{AE46AE30-8002-4F2C-B368-44546B1D71D8}"
@@ -53,6 +55,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{1DBDFC27
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Stunts.Tests", "Stunts\Stunts.Tests\Stunts.Tests.csproj", "{EDBDA217-CA42-4C82-826F-7D990185EC0F}"
 EndProject
+Project("{5DD5E4FA-CB73-4610-85AB-557B54E96AA9}") = "Stunts.Package", "Stunts\Stunts.Package\Stunts.Package.nuproj", "{91F9A526-E62C-491B-8774-88A61BDF1E1A}"
+EndProject
+Project("{5DD5E4FA-CB73-4610-85AB-557B54E96AA9}") = "Moq.Package", "Moq\Moq.Package\Moq.Package.nuproj", "{DCF0DC23-917D-4615-969A-6FAA863034C3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -103,6 +109,14 @@ Global
 		{EDBDA217-CA42-4C82-826F-7D990185EC0F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EDBDA217-CA42-4C82-826F-7D990185EC0F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EDBDA217-CA42-4C82-826F-7D990185EC0F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91F9A526-E62C-491B-8774-88A61BDF1E1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91F9A526-E62C-491B-8774-88A61BDF1E1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91F9A526-E62C-491B-8774-88A61BDF1E1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91F9A526-E62C-491B-8774-88A61BDF1E1A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DCF0DC23-917D-4615-969A-6FAA863034C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DCF0DC23-917D-4615-969A-6FAA863034C3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DCF0DC23-917D-4615-969A-6FAA863034C3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DCF0DC23-917D-4615-969A-6FAA863034C3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -114,6 +128,7 @@ Global
 		{0271D7C1-1A51-4148-944C-1DB4D1946B9C} = {EEC3EC48-ACB2-4D25-B592-F360F676BE45}
 		{1DBDFC27-21EC-4EAC-B51B-84EDC8DBB9D5} = {2093478C-CEA6-4034-BCDE-EDC7A5DD4532}
 		{EDBDA217-CA42-4C82-826F-7D990185EC0F} = {EEC3EC48-ACB2-4D25-B592-F360F676BE45}
+		{91F9A526-E62C-491B-8774-88A61BDF1E1A} = {EEC3EC48-ACB2-4D25-B592-F360F676BE45}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DA4CFD03-827D-482B-9304-83456D2A8115}

diff --git a/src/Moq/Moq.Package/Moq.Package.nuproj b/src/Moq/Moq.Package/Moq.Package.nuproj
@@ -0,0 +1,29 @@
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(NuGetAuthoringPath)\NuGet.Packaging.Authoring.props" Condition="Exists('$(NuGetAuthoringPath)\NuGet.Packaging.Authoring.props')" />
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>dcf0dc23-917d-4615-969a-6faa863034c3</ProjectGuid>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PackageId>Moq</PackageId>
+    <Title>Moq</Title>
+    <Summary>The most popular and friendly mocking framework for .NET</Summary>
+    <Description>The most popular and friendly mocking framework for .NET</Description>
+    <PackageTags>moq mocking mock</PackageTags>
+  </PropertyGroup>
+  <PropertyGroup>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
+    <TargetFramework>netstandard1.0</TargetFramework>
+    <PackageTargetFallback>net11;net20;net35;net40;net403;net45;net451;net452;net46;net461;net462;net47;net471;net472;netcore;netcore45;netcore451;netcore50;win8;win81;win10;sl4;sl5;wp;wp7;wp75;wp8;wp81;wpa81;uap;uap10;netstandard1.0;netstandard1.1;netstandard1.2;netstandard1.3;netstandard1.4;netstandard1.5;netstandard1.6;netstandard2.0;netcoreapp1.0;netcoreapp2.0;monoandroid;monotouch;monomac;xamarinios;xamarinmac;xamarinpsthree;xamarinpsfour;xamarinpsvita;xamarinwatchos;xamarintvos;xamarinxboxthreesixty;xamarinxboxone</PackageTargetFallback>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Moq.Analyzer\Moq.Analyzer.csproj" />
+    <ProjectReference Include="..\Moq.Sdk\Moq.Sdk.csproj">
+      <!-- This causes the output of the Sdk project to be packaged into the analyzer folder too -->
+      <AdditionalProperties>PrimaryOutputKind=Analyzers</AdditionalProperties>
+    </ProjectReference>
+    <ProjectReference Include="..\Moq\Moq.csproj" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
+  <Import Project="$(NuGetAuthoringPath)\NuGet.Packaging.Authoring.targets" Condition="Exists('$(NuGetAuthoringPath)\NuGet.Packaging.Authoring.targets')" />
+</Project>
diff --git a/src/Moq/Moq.Sdk/DefaultMock.cs b/src/Moq/Moq.Sdk/DefaultMock.cs
@@ -33,9 +33,9 @@ public DefaultMock(IStunt stunt)
         public IList<IMethodInvocation> Invocations { get; } = new List<IMethodInvocation>();
 
         /// <inheritdoc />
+        [DebuggerBrowsable(DebuggerBrowsableState.Never)]
         public object Object => stunt;
 
-        //[DebuggerDisplay("", Name = "State", Type = nameof(MockState))]
         /// <inheritdoc />
         public MockState State { get; } = new MockState();
 

diff --git a/src/Moq/Moq.Sdk/Moq.Sdk.csproj b/src/Moq/Moq.Sdk/Moq.Sdk.csproj
@@ -23,8 +23,4 @@
 	  </EmbeddedResource>
 	</ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="IFluentInterface" Version="2.0.4" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/Moq/Moq.Tests/Moq.Tests.csproj b/src/Moq/Moq.Tests/Moq.Tests.csproj
@@ -1,43 +1,36 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <TargetFramework>net471</TargetFramework>
     <IncludeXunit>true</IncludeXunit>
     <IncludeMSBuild>true</IncludeMSBuild>
-
     <!-- Don't include this assembly in the generated ReferencePaths.g.cs because we confuse Roslyn with NS2 + net471 refs -->
     <IncludeTargetPath>false</IncludeTargetPath>
     <!-- We declare the Analyzer to be a dependency for IDE build order -->
     <AddSyntheticProjectReferencesForSolutionDependencies>false</AddSyntheticProjectReferencesForSolutionDependencies>
   </PropertyGroup>
-
   <ItemGroup>
     <Compile Include="..\Moq\contentFiles\cs\netstandard1.3\*.cs" Visible="false" />
   </ItemGroup>
-
   <ItemGroup>
     <Compile Include="..\..\Testing\AssertCode.cs" Link="Helpers\AssertCode.cs" />
     <Compile Include="..\..\Testing\MockBuildEngine.cs" Link="Helpers\MockBuildEngine.cs" />
     <Compile Include="..\..\Testing\RecordingBehavior.cs" Link="Helpers\RecordingBehavior.cs" />
     <Compile Include="..\..\Testing\TestHelpers.cs" Link="Helpers\TestHelpers.cs" />
     <Compile Include="..\..\Testing\TestOutputLogger.cs" Link="Helpers\TestOutputLogger.cs" />
   </ItemGroup>
-
   <ItemGroup>
     <!-- TODO: since we can't get Roslyn to compile code during test run, we must generate mocks at design-time  -->
-    <Analyzer Include="$(BaseOutputPath)$(Configuration)\Stunts.dll" />
-    <Analyzer Include="$(BaseOutputPath)$(Configuration)\Stunts.Sdk.dll" />
-    <Analyzer Include="$(BaseOutputPath)$(Configuration)\Roslyn.Services.Test.Utilities.dll" />
-    <Analyzer Include="$(BaseOutputPath)$(Configuration)\Stunts.Analyzer.dll" />
-    <Analyzer Include="$(BaseOutputPath)$(Configuration)\Moq.Sdk.dll" />
-    <Analyzer Include="$(BaseOutputPath)$(Configuration)\Moq.Analyzer.dll" />
+    <Analyzer Include="$(RootPath)\src\Stunts\Stunts\bin\$(Configuration)\Stunts.dll" />
+    <Analyzer Include="$(RootPath)\src\Stunts\Stunts.Sdk\bin\$(Configuration)\Stunts.Sdk.dll" />
+    <Analyzer Include="$(RootPath)\src\Stunts\Stunts.Internal\bin\$(Configuration)\Roslyn.Services.Test.Utilities.dll" />
+    <Analyzer Include="$(RootPath)\src\Stunts\Stunts.Analyzer\bin\$(Configuration)\Stunts.Analyzer.dll" />
+    <Analyzer Include="$(RootPath)\src\Moq\Moq.Sdk\bin\$(Configuration)\Moq.Sdk.dll" />
+    <Analyzer Include="$(RootPath)\src\Moq\Moq.Analyzer\bin\$(Configuration)\Moq.Analyzer.dll" />
   </ItemGroup>
-
   <ItemGroup>
     <IncludeReferenceFilter Include="Moq" />
     <ExcludeReferenceFilter Include="Moq.Analyzer" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\Moq.Analyzer\Moq.Analyzer.csproj" />
     <ProjectReference Include="..\Moq.Sdk\Moq.Sdk.csproj" />
@@ -46,5 +39,4 @@
     <ProjectReference Include="..\..\Stunts\Stunts.Sdk\Stunts.Sdk.csproj" />
     <ProjectReference Include="..\..\Samples\Sample\Sample.csproj" />
   </ItemGroup>
-
 </Project>
diff --git a/src/Moq/Moq.Tests/MoqTests.cs b/src/Moq/Moq.Tests/MoqTests.cs
@@ -15,7 +15,7 @@ public class MoqTests
         public void CanRaiseEvents()
         {
             var calculator = Mock.Of<ICalculator>().Named("calculator");
-
+            
             var raised = false;
 
             EventHandler handler = (sender, args) => raised = true;
@@ -106,7 +106,6 @@ public void CanSetupMethodWithDifferentArgumentsViaReturns()
             calculator.Add(2, 3).Returns(5);
 
             calculator.Add(10, Any<int>()).Returns(10);
-
             calculator.Add(Any<int>(i => i > 20), Any<int>()).Returns(20);
 
             Assert.Equal(5, calculator.Add(2, 3));

diff --git a/src/Moq/Moq/Moq.csproj b/src/Moq/Moq/Moq.csproj
@@ -2,10 +2,11 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+    <PackageId>Moq.Core</PackageId>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Stunts\Stunts\Stunts.csproj" />
     <ProjectReference Include="..\Moq.Sdk\Moq.Sdk.csproj" />
   </ItemGroup>
 

diff --git a/src/Samples/Moq.CSharp/Moq.CSharp.csproj b/src/Samples/Moq.CSharp/Moq.CSharp.csproj
@@ -14,12 +14,12 @@
     <ProjectReference Include="..\..\..\src\Moq\Moq.Sdk\Moq.Sdk.csproj" />
     <ProjectReference Include="..\Sample\Sample.csproj" />
 
-    <Analyzer Include="$(BinPath)\Stunts.dll" />
-    <Analyzer Include="$(BinPath)\Stunts.Sdk.dll" />
-    <Analyzer Include="$(BinPath)\Stunts.Analyzer.dll" />
-    <Analyzer Include="$(BinPath)\Roslyn.Services.Test.Utilities.dll" />
-    <Analyzer Include="$(BinPath)\Moq.Sdk.dll" />
-    <Analyzer Include="$(BinPath)\Moq.Analyzer.dll" />
+    <Analyzer Include="..\..\..\src\Stunts\Stunts\bin\$(Configuration)\Stunts.dll" />
+    <Analyzer Include="..\..\..\src\Stunts\Stunts.Sdk\bin\$(Configuration)\Stunts.Sdk.dll" />
+    <Analyzer Include="..\..\..\src\Stunts\Stunts.Analyzer\bin\$(Configuration)\Stunts.Analyzer.dll" />
+    <Analyzer Include="..\..\..\src\Stunts\Stunts.Internal\bin\$(Configuration)\Roslyn.Services.Test.Utilities.dll" />
+    <Analyzer Include="..\..\..\src\Moq\Moq.Sdk\bin\$(Configuration)\Moq.Sdk.dll" />
+    <Analyzer Include="..\..\..\src\Moq\Moq.Analyzer\bin\$(Configuration)\Moq.Analyzer.dll" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/Moq.VisualBasic/Moq.VisualBasic.vbproj b/src/Samples/Moq.VisualBasic/Moq.VisualBasic.vbproj
@@ -18,12 +18,12 @@
     <ProjectReference Include="..\..\..\src\Moq\Moq.Sdk\Moq.Sdk.csproj" />
     <ProjectReference Include="..\Sample\Sample.csproj" />
 
-    <Analyzer Include="$(BinPath)\Stunts.dll" />
-    <Analyzer Include="$(BinPath)\Stunts.Sdk.dll" />
-    <Analyzer Include="$(BinPath)\Stunts.Analyzer.dll" />
-    <Analyzer Include="$(BinPath)\Roslyn.Services.Test.Utilities.dll" />
-    <Analyzer Include="$(BinPath)\Moq.Sdk.dll" />
-    <Analyzer Include="$(BinPath)\Moq.Analyzer.dll" />
+    <Analyzer Include="..\..\..\src\Stunts\Stunts\bin\$(Configuration)\Stunts.dll" />
+    <Analyzer Include="..\..\..\src\Stunts\Stunts.Sdk\bin\$(Configuration)\Stunts.Sdk.dll" />
+    <Analyzer Include="..\..\..\src\Stunts\Stunts.Analyzer\bin\$(Configuration)\Stunts.Analyzer.dll" />
+    <Analyzer Include="..\..\..\src\Stunts\Stunts.Internal\bin\$(Configuration)\Roslyn.Services.Test.Utilities.dll" />
+    <Analyzer Include="..\..\..\src\Moq\Moq.Sdk\bin\$(Configuration)\Moq.Sdk.dll" />
+    <Analyzer Include="..\..\..\src\Moq\Moq.Analyzer\bin\$(Configuration)\Moq.Analyzer.dll" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/Stunts.CSharp/Stunts.CSharp.csproj b/src/Samples/Stunts.CSharp/Stunts.CSharp.csproj
@@ -12,10 +12,10 @@
     <ProjectReference Include="..\..\..\src\Stunts\Stunts\Stunts.csproj" />
     <ProjectReference Include="..\Sample\Sample.csproj" />
 
-    <Analyzer Include="$(BinPath)\Stunts.dll" />
-    <Analyzer Include="$(BinPath)\Stunts.Sdk.dll" />
-    <Analyzer Include="$(BinPath)\Stunts.Analyzer.dll" />
-    <Analyzer Include="$(BinPath)\Roslyn.Services.Test.Utilities.dll" />
+    <Analyzer Include="..\..\..\src\Stunts\Stunts\bin\$(Configuration)\Stunts.dll" />
+    <Analyzer Include="..\..\..\src\Stunts\Stunts.Sdk\bin\$(Configuration)\Stunts.Sdk.dll" />
+    <Analyzer Include="..\..\..\src\Stunts\Stunts.Analyzer\bin\$(Configuration)\Stunts.Analyzer.dll" />
+    <Analyzer Include="..\..\..\src\Stunts\Stunts.Internal\bin\$(Configuration)\Roslyn.Services.Test.Utilities.dll" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Samples/Stunts.VisualBasic/Stunts.VisualBasic.vbproj b/src/Samples/Stunts.VisualBasic/Stunts.VisualBasic.vbproj
@@ -13,10 +13,10 @@
     <ProjectReference Include="..\..\..\src\Stunts\Stunts\Stunts.csproj" />
     <ProjectReference Include="..\Sample\Sample.csproj" />
 
-    <Analyzer Include="$(BinPath)\Stunts.dll" />
-    <Analyzer Include="$(BinPath)\Stunts.Sdk.dll" />
-    <Analyzer Include="$(BinPath)\Stunts.Analyzer.dll" />
-    <Analyzer Include="$(BinPath)\Roslyn.Services.Test.Utilities.dll" />
+    <Analyzer Include="..\..\..\src\Stunts\Stunts\bin\$(Configuration)\Stunts.dll" />
+    <Analyzer Include="..\..\..\src\Stunts\Stunts.Sdk\bin\$(Configuration)\Stunts.Sdk.dll" />
+    <Analyzer Include="..\..\..\src\Stunts\Stunts.Analyzer\bin\$(Configuration)\Stunts.Analyzer.dll" />
+    <Analyzer Include="..\..\..\src\Stunts\Stunts.Internal\bin\$(Configuration)\Roslyn.Services.Test.Utilities.dll" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Stunts/Stunts.Analyzer/Stunts.Analyzer.csproj b/src/Stunts/Stunts.Analyzer/Stunts.Analyzer.csproj
@@ -4,9 +4,16 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>Stunts</RootNamespace>
     <IncludeRoslyn>true</IncludeRoslyn>
-    <PrimaryOutputKind>Analyzers</PrimaryOutputKind>
+    <PrimaryOutputKind Condition="'$(PrimaryOutputKind)' == ''">Analyzers</PrimaryOutputKind>
   </PropertyGroup>
 
+  <ItemDefinitionGroup>
+    <ProjectReference>
+      <!-- This causes the output of the referenced projects to be packaged into the analyzer folder too -->
+      <AdditionalProperties>PrimaryOutputKind=$(PrimaryOutputKind)</AdditionalProperties>
+    </ProjectReference>
+  </ItemDefinitionGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Stunts\Stunts.csproj" />
     <ProjectReference Include="..\Stunts.Internal\Stunts.Internal.csproj" />

diff --git a/src/Stunts/Stunts.Internal/Stunts.Internal.csproj b/src/Stunts/Stunts.Internal/Stunts.Internal.csproj
@@ -12,7 +12,7 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>$(MSBuildProjectDirectory)\RoslynInternalKey.Private.snk</AssemblyOriginatorKeyFile>
 
-    <PrimaryOutputKind>Analyzers</PrimaryOutputKind>
+    <PrimaryOutputKind Condition="'$(PrimaryOutputKind)' == ''">Analyzers</PrimaryOutputKind>
   </PropertyGroup>
 
 </Project>
diff --git a/src/Stunts/Stunts.Package/Readme.txt b/src/Stunts/Stunts.Package/Readme.txt
diff --git a/src/Stunts/Stunts.Package/Stunts.Package.nuproj b/src/Stunts/Stunts.Package/Stunts.Package.nuproj
@@ -6,34 +6,20 @@
   </PropertyGroup>
   <PropertyGroup>
     <PackageId>Stunts</PackageId>
-    <PackageVersion Condition="'$(PackageVersion)' == ''">1.0.0</PackageVersion>
     <Title>Stunts</Title>
-    <Authors>kzu</Authors>
-    <Owners>kzu</Owners>
     <Summary>"Dynamic proxies" that can run everywhere, including mobile!</Summary>
     <Description>Design-time generated classes whose behavior can be configured dynamically at run-time with arbitrary behaviors (a.k.a. "proxies").</Description>
-    <PackageReleaseNotes>
-    </PackageReleaseNotes>
-    <PackageProjectUrl>https://github.com/moq/moq/</PackageProjectUrl>
-    <PackageLicenseUrl>https://github.com/moq/moq/blob/master/LICENSE</PackageLicenseUrl>
-    <Copyright>Copyright © 2017 Moq Team</Copyright>
     <PackageTags>netstandard proxy runtime dynamic</PackageTags>
   </PropertyGroup>
   <PropertyGroup>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
     <TargetFramework>netstandard1.0</TargetFramework>
     <PackageTargetFallback>net11;net20;net35;net40;net403;net45;net451;net452;net46;net461;net462;net47;net471;net472;netcore;netcore45;netcore451;netcore50;win8;win81;win10;sl4;sl5;wp;wp7;wp75;wp8;wp81;wpa81;uap;uap10;netstandard1.0;netstandard1.1;netstandard1.2;netstandard1.3;netstandard1.4;netstandard1.5;netstandard1.6;netstandard2.0;netcoreapp1.0;netcoreapp2.0;monoandroid;monotouch;monomac;xamarinios;xamarinmac;xamarinpsthree;xamarinpsfour;xamarinpsvita;xamarinwatchos;xamarintvos;xamarinxboxthreesixty;xamarinxboxone</PackageTargetFallback>
-    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-    <OutputPath>bin\$(Configuration)\</OutputPath>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'" />
-  <ItemGroup>
-    <PackageFile Include="Readme.txt" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Stunts.Analyzer\Stunts.Analyzer.csproj" />
     <ProjectReference Include="..\Stunts.Sdk\Stunts.Sdk.csproj">
+      <!-- This causes the output of the Sdk project to be packaged into the analyzer folder too -->
       <AdditionalProperties>PrimaryOutputKind=Analyzers</AdditionalProperties>
     </ProjectReference>
     <ProjectReference Include="..\Stunts\Stunts.csproj" />
-Original file line number
+Diff line change
@@ -1,5 +1,6 @@
     .nuget
     .vs
+    .idea
     out
     bin
     obj
@@ Expand Down @@