Toolkit

2016-07-28 11:51:37 -07:00 · 2016-07-28 11:51:37 -07:00 · 885d5fbb32
--- a/Microsoft.Windows.Toolkit/Helpers/ColorHelper.cs
+++ b/Microsoft.Windows.Toolkit/Helpers/ColorHelper.cs
--- a/Microsoft.Windows.Toolkit/Helpers/ConnectionHelper.cs
+++ b/Microsoft.Windows.Toolkit/Helpers/ConnectionHelper.cs
--- a/Microsoft.Windows.Toolkit/Helpers/StorageFileHelper.cs
+++ b/Microsoft.Windows.Toolkit/Helpers/StorageFileHelper.cs
--- a/Microsoft.Windows.Toolkit/Helpers/StreamHelper.cs
+++ b/Microsoft.Windows.Toolkit/Helpers/StreamHelper.cs
--- a/Microsoft.Windows.Toolkit/Helpers/WeakEventListener.cs
+++ b/Microsoft.Windows.Toolkit/Helpers/WeakEventListener.cs
--- a/Microsoft.Windows.Toolkit/Microsoft.Windows.Toolkit.csproj
+++ b/Microsoft.Windows.Toolkit/Microsoft.Windows.Toolkit.csproj
@ -27,7 +27,7 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <DocumentationFile>bin\Debug\Microsoft.Toolkit.Uwp.xml</DocumentationFile>
-    <CodeAnalysisRuleSet>Microsoft.Windows.Toolkit1.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>Microsoft.Toolkit.Uwp1.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
@ -40,12 +40,12 @@
    <RunCodeAnalysis>true</RunCodeAnalysis>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
    <DocumentationFile>bin\Release\Microsoft.Toolkit.Uwp.xml</DocumentationFile>
-    <CodeAnalysisRuleSet>Microsoft.Windows.Toolkit1.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>Microsoft.Toolkit.Uwp1.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <ItemGroup>
    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-    <None Include="Microsoft.Windows.Toolkit.ruleset" />
-    <None Include="Microsoft.Windows.Toolkit1.ruleset" />
+    <None Include="Microsoft.Toolkit.Uwp.ruleset" />
+    <None Include="Microsoft.Toolkit.Uwp1.ruleset" />
    <None Include="project.json" />
  </ItemGroup>
  <ItemGroup>
@ -72,7 +72,7 @@
    <PlatformTarget>AnyCPU</PlatformTarget>
    <UseVSHostingProcess>false</UseVSHostingProcess>
    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>Microsoft.Windows.Toolkit1.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>Microsoft.Toolkit.Uwp1.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug %28Anniversary Update%29|AnyCPU'">
    <DebugSymbols>true</DebugSymbols>
@ -84,7 +84,7 @@
    <PlatformTarget>AnyCPU</PlatformTarget>
    <UseVSHostingProcess>false</UseVSHostingProcess>
    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>Microsoft.Windows.Toolkit1.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>Microsoft.Toolkit.Uwp1.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release %28Version 1511%29|AnyCPU'">
    <OutputPath>bin\Release %28Version 1511%29\</OutputPath>
@ -98,7 +98,7 @@
    <RunCodeAnalysis>true</RunCodeAnalysis>
    <UseVSHostingProcess>false</UseVSHostingProcess>
    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>Microsoft.Windows.Toolkit1.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>Microsoft.Toolkit.Uwp1.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release %28Anniversary Update%29|AnyCPU'">
    <OutputPath>bin\Release %28Anniversary Update%29\</OutputPath>
@ -112,7 +112,7 @@
    <RunCodeAnalysis>true</RunCodeAnalysis>
    <UseVSHostingProcess>false</UseVSHostingProcess>
    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>Microsoft.Windows.Toolkit1.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>Microsoft.Toolkit.Uwp1.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
--- a/Microsoft.Windows.Toolkit/Microsoft.Windows.Toolkit.ruleset
+++ b/Microsoft.Windows.Toolkit/Microsoft.Windows.Toolkit.ruleset
--- a/Microsoft.Windows.Toolkit/Microsoft.Windows.Toolkit1.ruleset
+++ b/Microsoft.Windows.Toolkit/Microsoft.Windows.Toolkit1.ruleset
--- a/Microsoft.Windows.Toolkit/Properties/AssemblyInfo.cs
+++ b/Microsoft.Windows.Toolkit/Properties/AssemblyInfo.cs
--- a/Microsoft.Windows.Toolkit/Properties/Microsoft.Windows.Toolkit.rd.xml
+++ b/Microsoft.Windows.Toolkit/Properties/Microsoft.Windows.Toolkit.rd.xml
--- a/Microsoft.Windows.Toolkit/Structures/HslColor.cs
+++ b/Microsoft.Windows.Toolkit/Structures/HslColor.cs
--- a/Microsoft.Windows.Toolkit/Structures/HsvColor.cs
+++ b/Microsoft.Windows.Toolkit/Structures/HsvColor.cs
--- a/Microsoft.Windows.Toolkit/project.json
+++ b/Microsoft.Windows.Toolkit/project.json
--- a/Microsoft.Windows.Toolkit.SampleApp/Microsoft.Windows.Toolkit.SampleApp.csproj
+++ b/Microsoft.Windows.Toolkit.SampleApp/Microsoft.Windows.Toolkit.SampleApp.csproj
@ -33,7 +33,7 @@
    <Prefer32Bit>true</Prefer32Bit>
    <DocumentationFile>
    </DocumentationFile>
-    <CodeAnalysisRuleSet>Microsoft.Windows.Toolkit.SampleApp.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\Microsoft.Windows.Toolkit\Microsoft.Toolkit.Uwp1.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
    <OutputPath>bin\x86\Release\</OutputPath>
@ -50,7 +50,7 @@
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
    <DocumentationFile>
    </DocumentationFile>
-    <CodeAnalysisRuleSet>Microsoft.Windows.Toolkit.SampleApp.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\Microsoft.Windows.Toolkit\Microsoft.Toolkit.Uwp1.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
    <DebugSymbols>true</DebugSymbols>
@ -62,7 +62,7 @@
    <UseVSHostingProcess>false</UseVSHostingProcess>
    <ErrorReport>prompt</ErrorReport>
    <Prefer32Bit>true</Prefer32Bit>
-    <CodeAnalysisRuleSet>Microsoft.Windows.Toolkit.SampleApp.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\Microsoft.Windows.Toolkit\Microsoft.Toolkit.Uwp1.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
    <OutputPath>bin\ARM\Release\</OutputPath>
@ -79,7 +79,7 @@
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
    <DocumentationFile>
    </DocumentationFile>
-    <CodeAnalysisRuleSet>Microsoft.Windows.Toolkit.SampleApp.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\Microsoft.Windows.Toolkit\Microsoft.Toolkit.Uwp1.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
    <DebugSymbols>true</DebugSymbols>
@ -91,7 +91,7 @@
    <UseVSHostingProcess>false</UseVSHostingProcess>
    <ErrorReport>prompt</ErrorReport>
    <Prefer32Bit>true</Prefer32Bit>
-    <CodeAnalysisRuleSet>Microsoft.Windows.Toolkit.SampleApp.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\Microsoft.Windows.Toolkit\Microsoft.Toolkit.Uwp1.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
    <OutputPath>bin\x64\Release\</OutputPath>
@ -108,7 +108,7 @@
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
    <DocumentationFile>
    </DocumentationFile>
-    <CodeAnalysisRuleSet>Microsoft.Windows.Toolkit.SampleApp.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\Microsoft.Windows.Toolkit\Microsoft.Toolkit.Uwp1.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <ItemGroup>
    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
@ -514,9 +514,9 @@
      <Project>{3dd8aa7c-3569-4e51-992f-0c2257e8878e}</Project>
      <Name>Microsoft.Windows.Toolkit.UI</Name>
    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.Windows.Toolkit\Microsoft.Windows.Toolkit.csproj">
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj">
      <Project>{805F80DF-75C6-4C2F-8FD9-B47F6D0DF5A3}</Project>
-      <Name>Microsoft.Windows.Toolkit</Name>
+      <Name>Microsoft.Toolkit.Uwp</Name>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup />
--- a/Microsoft.Windows.Toolkit.Services/Microsoft.Windows.Toolkit.Services.csproj
+++ b/Microsoft.Windows.Toolkit.Services/Microsoft.Windows.Toolkit.Services.csproj
@ -26,7 +26,7 @@
    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>Microsoft.Windows.Toolkit.Services1.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\Microsoft.Windows.Toolkit\Microsoft.Toolkit.Uwp1.ruleset</CodeAnalysisRuleSet>
    <DocumentationFile>bin\Debug\Microsoft.Toolkit.Uwp.Services.xml</DocumentationFile>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@ -38,7 +38,7 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <DocumentationFile>bin\Release\Microsoft.Toolkit.Uwp.Services.xml</DocumentationFile>
-    <CodeAnalysisRuleSet>Microsoft.Windows.Toolkit.Services1.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\Microsoft.Windows.Toolkit\Microsoft.Toolkit.Uwp1.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <ItemGroup>
    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
@ -133,7 +133,7 @@
    <PlatformTarget>AnyCPU</PlatformTarget>
    <UseVSHostingProcess>false</UseVSHostingProcess>
    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>Microsoft.Windows.Toolkit.Services1.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\Microsoft.Windows.Toolkit\Microsoft.Toolkit.Uwp1.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug %28Anniversary Update%29|AnyCPU'">
    <DebugSymbols>true</DebugSymbols>
@ -145,7 +145,7 @@
    <PlatformTarget>AnyCPU</PlatformTarget>
    <UseVSHostingProcess>false</UseVSHostingProcess>
    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>Microsoft.Windows.Toolkit.Services1.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\Microsoft.Windows.Toolkit\Microsoft.Toolkit.Uwp1.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release %28Version 1511%29|AnyCPU'">
    <OutputPath>bin\Release %28Version 1511%29\</OutputPath>
@ -157,7 +157,7 @@
    <PlatformTarget>AnyCPU</PlatformTarget>
    <UseVSHostingProcess>false</UseVSHostingProcess>
    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>Microsoft.Windows.Toolkit.Services1.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\Microsoft.Windows.Toolkit\Microsoft.Toolkit.Uwp1.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release %28Anniversary Update%29|AnyCPU'">
    <OutputPath>bin\Release %28Anniversary Update%29\</OutputPath>
@ -169,7 +169,7 @@
    <PlatformTarget>AnyCPU</PlatformTarget>
    <UseVSHostingProcess>false</UseVSHostingProcess>
    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>Microsoft.Windows.Toolkit.Services1.ruleset</CodeAnalysisRuleSet>
+    <CodeAnalysisRuleSet>..\Microsoft.Windows.Toolkit\Microsoft.Toolkit.Uwp1.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
--- a/Microsoft.Windows.Toolkit.UI.Animations/Microsoft.Windows.Toolkit.UI.Animations.csproj
+++ b/Microsoft.Windows.Toolkit.UI.Animations/Microsoft.Windows.Toolkit.UI.Animations.csproj
@ -64,9 +64,9 @@
      <Name>Microsoft.Windows.Toolkit.UI</Name>
      <Private>False</Private>
    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.Windows.Toolkit\Microsoft.Windows.Toolkit.csproj">
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj">
      <Project>{805f80df-75c6-4c2f-8fd9-b47f6d0df5a3}</Project>
-      <Name>Microsoft.Windows.Toolkit</Name>
+      <Name>Microsoft.Toolkit.Uwp</Name>
      <Private>False</Private>
    </ProjectReference>
  </ItemGroup>
--- a/Microsoft.Windows.Toolkit.UI.Controls/Microsoft.Windows.Toolkit.UI.Controls.csproj
+++ b/Microsoft.Windows.Toolkit.UI.Controls/Microsoft.Windows.Toolkit.UI.Controls.csproj
@ -142,9 +142,9 @@
      <Project>{3DD8AA7C-3569-4E51-992F-0C2257E8878E}</Project>
      <Name>Microsoft.Windows.Toolkit.UI</Name>
    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.Windows.Toolkit\Microsoft.Windows.Toolkit.csproj">
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj">
      <Project>{805f80df-75c6-4c2f-8fd9-b47f6d0df5a3}</Project>
-      <Name>Microsoft.Windows.Toolkit</Name>
+      <Name>Microsoft.Toolkit.Uwp</Name>
      <Private>False</Private>
    </ProjectReference>
  </ItemGroup>
--- a/Microsoft.Windows.Toolkit.UI.Controls/Themes/Generic.xaml
+++ b/Microsoft.Windows.Toolkit.UI.Controls/Themes/Generic.xaml
@ -2,16 +2,16 @@
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
    <ResourceDictionary.MergedDictionaries>
-		<ResourceDictionary Source="ms-appx:///Microsoft.Windows.Toolkit.UI.Controls/HamburgerMenu/HamburgerMenu.xaml"/>
-		<ResourceDictionary Source="ms-appx:///Microsoft.Windows.Toolkit.UI.Controls/ResponsiveGridView/ResponsiveGridView.xaml"/>
-		<ResourceDictionary Source="ms-appx:///Microsoft.Windows.Toolkit.UI.Controls/VariableSizedGridView/VariableSizedGridView.xaml"/>
-        <ResourceDictionary Source="ms-appx:///Microsoft.Windows.Toolkit.UI.Controls/RangeSelector/RangeSelector.xaml"/>
-        <ResourceDictionary Source="ms-appx:///Microsoft.Windows.Toolkit.UI.Controls/SlidableListItem/SlidableListItem.xaml"/>
-        <ResourceDictionary Source="ms-appx:///Microsoft.Windows.Toolkit.UI.Controls/ImageEx/ImageEx.xaml"/>
-        <ResourceDictionary Source="ms-appx:///Microsoft.Windows.Toolkit.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Windows.Toolkit.UI.Controls/RadialGauge/RadialGauge.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Windows.Toolkit.UI.Controls/PullToRefreshListView/PullToRefreshListView.xaml" />
-        <ResourceDictionary Source="ms-appx:///Microsoft.Windows.Toolkit.UI.Controls/RotatorTile/RotatorTile.xaml" />
+		<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/HamburgerMenu/HamburgerMenu.xaml"/>
+		<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ResponsiveGridView/ResponsiveGridView.xaml"/>
+		<ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/VariableSizedGridView/VariableSizedGridView.xaml"/>
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/RangeSelector/RangeSelector.xaml"/>
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/SlidableListItem/SlidableListItem.xaml"/>
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/ImageEx/ImageEx.xaml"/>
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/HeaderedTextBlock/HeaderedTextBlock.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/RadialGauge/RadialGauge.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/PullToRefreshListView/PullToRefreshListView.xaml" />
+        <ResourceDictionary Source="ms-appx:///Microsoft.Toolkit.Uwp.UI.Controls/RotatorTile/RotatorTile.xaml" />
    </ResourceDictionary.MergedDictionaries>

 </ResourceDictionary>
--- a/Microsoft.Windows.Toolkit.UI/Microsoft.Windows.Toolkit.UI.csproj
+++ b/Microsoft.Windows.Toolkit.UI/Microsoft.Windows.Toolkit.UI.csproj
@ -60,9 +60,9 @@
    <Compile Include="Properties\AssemblyInfo.cs" />
  </ItemGroup>
  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Windows.Toolkit\Microsoft.Windows.Toolkit.csproj">
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj">
      <Project>{805f80df-75c6-4c2f-8fd9-b47f6d0df5a3}</Project>
-      <Name>Microsoft.Windows.Toolkit</Name>
+      <Name>Microsoft.Toolkit.Uwp</Name>
      <Private>False</Private>
    </ProjectReference>
  </ItemGroup>
--- a/Toolkit.sln
+++ b/Toolkit.sln
@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Windows.Toolkit", "Microsoft.Windows.Toolkit\Microsoft.Windows.Toolkit.csproj", "{805F80DF-75C6-4C2F-8FD9-B47F6D0DF5A3}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Toolkit.Uwp", "Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj", "{805F80DF-75C6-4C2F-8FD9-B47F6D0DF5A3}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "UnitTests\UnitTests.csproj", "{A139968E-AD78-4E8C-93B8-9A5523BCAC89}"
 EndProject
--- a/Toolkit.sln.DotSettings
+++ b/Toolkit.sln.DotSettings
@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/NamespacesWithAnnotations/=Microsoft_002EWindows_002EToolkit_002ESampleApp_002EAnnotations/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
--- a/UnitTests/UnitTests.csproj
+++ b/UnitTests/UnitTests.csproj
@ -148,9 +148,9 @@
      <Project>{3dd8aa7c-3569-4e51-992f-0c2257e8878e}</Project>
      <Name>Microsoft.Windows.Toolkit.UI</Name>
    </ProjectReference>
-    <ProjectReference Include="..\Microsoft.Windows.Toolkit\Microsoft.Windows.Toolkit.csproj">
+    <ProjectReference Include="..\Microsoft.Toolkit.Uwp\Microsoft.Toolkit.Uwp.csproj">
      <Project>{805f80df-75c6-4c2f-8fd9-b47f6d0df5a3}</Project>
-      <Name>Microsoft.Windows.Toolkit</Name>
+      <Name>Microsoft.Toolkit.Uwp</Name>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>