Domain Framework rename to RESTier

Change license header to a reference to the License.txt in project root. Bootstrap Nuget. Allow additional properties when restore Nuget packages.
chinadragon0515 · Dec 2, 2014 · 726f3ac · 726f3ac
1 parent 6f65070
commit 726f3ac
Show file tree

Hide file tree

Showing 192 changed files with 407 additions and 3,436 deletions.
diff --git a/BuildNuGets.cmd b/BuildNuGets.cmd
@@ -2,6 +2,11 @@
 pushd %~dp0
 setlocal
 
+if exist .nuget\nuget.exe goto Prepare
+echo Downloading Nuget.exe
+call build.cmd DownloadNuGet >NUL
+
+:Prepare
 if exist bin\nuget goto Configure
 md bin\nuget
 
@@ -15,11 +20,11 @@ md bin\nuget\%config%
 :Build
 set params=-Prop Configuration=%config% -OutputDirectory bin\nuget\%config%
 
-tools\NuGet\NuGet pack src\Microsoft.Data.Domain\Microsoft.Data.Domain.csproj %params%
-tools\NuGet\NuGet pack src\Microsoft.Data.Domain.Conventions\Microsoft.Data.Domain.Conventions.csproj %params%
-tools\NuGet\NuGet pack src\Microsoft.Data.Domain.Security\Microsoft.Data.Domain.Security.csproj %params%
-tools\NuGet\NuGet pack src\Microsoft.Data.Domain.EntityFramework\Microsoft.Data.Domain.EntityFramework.csproj %params%
-tools\NuGet\NuGet pack src\System.Web.OData.Domain\System.Web.OData.Domain.csproj %params%
+.nuget\NuGet pack src\Microsoft.Data.Domain\Microsoft.Data.Domain.csproj %params%
+.nuget\NuGet pack src\Microsoft.Data.Domain.Conventions\Microsoft.Data.Domain.Conventions.csproj %params%
+.nuget\NuGet pack src\Microsoft.Data.Domain.Security\Microsoft.Data.Domain.Security.csproj %params%
+.nuget\NuGet pack src\Microsoft.Data.Domain.EntityFramework\Microsoft.Data.Domain.EntityFramework.csproj %params%
+.nuget\NuGet pack src\System.Web.OData.Domain\System.Web.OData.Domain.csproj %params%
 
 popd
 endlocal
diff --git a/license.txt → License.txt b/license.txt → License.txt
@@ -1,4 +1,4 @@
-Domain Framework ver. 1.0
+RESTier ver. 1.0
 Copyright (c) Microsoft Corporation
 All rights reserved.
 MIT License

diff --git a/DomainFramework.msbuild → RESTier.msbuild b/DomainFramework.msbuild → RESTier.msbuild
@@ -1,9 +1,9 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="tools\DF.tasks.targets"/>
+  <Import Project="tools\RESTier.tasks.targets"/>
   <UsingTask TaskName="SkipStrongNames.CheckSkipStrongNamesStatus" AssemblyFile="$(SkipStrongNamesExe)" />
 
   <ItemGroup>
-    <SolutionsToBuild Include="DomainFramework.sln">
+    <SolutionsToBuild Include="RESTier.sln">
       <BuildInParallel>$(BuildInParallel)</BuildInParallel>
     </SolutionsToBuild>
   </ItemGroup>
@@ -16,10 +16,12 @@
     <CodeAnalysis Condition=" '$(CodeAnalysis)' == '' and '$(Configuration)' != 'Release' ">true</CodeAnalysis>
     <SkipStrongNamesExe>$(MSBuildThisFileDirectory)packages\Microsoft.Web.SkipStrongNames.1.0.0\tools\SkipStrongNames.exe</SkipStrongNamesExe>
     <SkipStrongNamesXml>$(MSBuildThisFileDirectory)tools\SkipStrongNames.xml</SkipStrongNamesXml>
+    <AdditionalRestoreProps></AdditionalRestoreProps>
   </PropertyGroup>
 
   <Target Name="RestoreSkipStrongNames" DependsOnTargets="DownloadNuGet">
-    <Exec Command='"$(NuGetExe)" restore .nuget\packages.config -PackagesDirectory packages -NonInteractive -Verbosity detailed -ConfigFile .nuget\NuGet.Config' />
+    <Exec Command='"$(NuGetExe)" restore .nuget\packages.config -PackagesDirectory packages -NonInteractive ^
+          -Verbosity detailed -ConfigFile .nuget\NuGet.Config' />
   </Target>
 
   <Target Name="EnableSkipStrongNames" DependsOnTargets="RestoreSkipStrongNames">
@@ -44,7 +46,9 @@
 
   <Target Name="RestorePackages" DependsOnTargets="DownloadNuGet">
     <Message Text="Restoring NuGet packages..." Importance="High" />
-    <Exec Command='"$(NuGetExe)" restore "%(SolutionsToBuild.Identity)" -PackagesDirectory packages -NonInteractive -Verbosity detailed -ConfigFile "$(MsBuildThisFileDirectory)$(NuGetFolder)\NuGet.Config" -NoCache' />
+    <Exec Command='"$(NuGetExe)" restore "%(SolutionsToBuild.Identity)" -PackagesDirectory packages -NonInteractive ^
+          -Verbosity detailed -ConfigFile "$(MsBuildThisFileDirectory)$(NuGetFolder)\NuGet.Config" ^
+          -NoCache $(AdditionalRestoreProps)' />
   </Target>
 
   <Target Name="BuildTools">

diff --git a/DomainFramework.sln → RESTier.sln b/DomainFramework.sln → RESTier.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30723.0
+VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D5E947EB-03CB-4D04-8937-FF2131BB1F04}"
 EndProject
@@ -39,6 +39,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Web.OData.Domain.Tes
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Web.OData.Domain.Test.Services.Trippin", "test\ODataEndToEndTests\System.Web.OData.Domain.Pipeline.Test.Services.Trippin\System.Web.OData.Domain.Test.Services.Trippin.csproj", "{B379640E-9064-438D-8DA5-6F7B394C2C46}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{EBBFEC28-7D5C-4870-AD2B-F881EEC5E8A0}"
+	ProjectSection(SolutionItems) = preProject
+		.nuget\packages.config = .nuget\packages.config
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -91,19 +96,19 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{3F748477-9CDD-485C-A885-1FEC14A24331} = {D5E947EB-03CB-4D04-8937-FF2131BB1F04}
-		{8C1F84BA-3888-4FC5-A286-506A11C54463} = {D5E947EB-03CB-4D04-8937-FF2131BB1F04}
-		{0355FEC8-17CF-44B4-9D24-685266A349FB} = {D5E947EB-03CB-4D04-8937-FF2131BB1F04}
-		{432208D4-54DF-453E-96AE-CB7721461030} = {D5E947EB-03CB-4D04-8937-FF2131BB1F04}
-		{E136CA13-ECD1-4565-B183-A48F78570DE3} = {D5E947EB-03CB-4D04-8937-FF2131BB1F04}
 		{F1BEAB8D-82D4-4BBB-A5C6-BA0E6872E508} = {3F748477-9CDD-485C-A885-1FEC14A24331}
+		{8C1F84BA-3888-4FC5-A286-506A11C54463} = {D5E947EB-03CB-4D04-8937-FF2131BB1F04}
 		{5A10C8BB-5CA0-4D41-A731-45CD29A30D34} = {8C1F84BA-3888-4FC5-A286-506A11C54463}
 		{B15A5064-F0D2-480C-A51E-3430A8360827} = {8C1F84BA-3888-4FC5-A286-506A11C54463}
+		{0355FEC8-17CF-44B4-9D24-685266A349FB} = {D5E947EB-03CB-4D04-8937-FF2131BB1F04}
 		{F7EC910E-17CE-4579-84C5-36D3777B3218} = {0355FEC8-17CF-44B4-9D24-685266A349FB}
+		{432208D4-54DF-453E-96AE-CB7721461030} = {D5E947EB-03CB-4D04-8937-FF2131BB1F04}
 		{186F667E-54E5-4B57-9998-21D74CB77C24} = {432208D4-54DF-453E-96AE-CB7721461030}
 		{D1F0FA28-73A1-4202-807B-DCAF5FFEDC2F} = {552DD8A7-2F3A-4D0F-B623-B7D832C6C62B}
+		{E136CA13-ECD1-4565-B183-A48F78570DE3} = {D5E947EB-03CB-4D04-8937-FF2131BB1F04}
+		{BCE769AD-2D64-4EAD-B83D-1328621CF6E6} = {E136CA13-ECD1-4565-B183-A48F78570DE3}
 		{B10AC223-BB61-4229-A063-353AD5D7E3C6} = {552DD8A7-2F3A-4D0F-B623-B7D832C6C62B}
 		{4AC28EC2-FBCF-44CA-A922-0B257F55DE0D} = {552DD8A7-2F3A-4D0F-B623-B7D832C6C62B}
-		{BCE769AD-2D64-4EAD-B83D-1328621CF6E6} = {E136CA13-ECD1-4565-B183-A48F78570DE3}
 		{C5FDAD47-4449-42FC-904F-C7FEBD0F4DB7} = {4AC28EC2-FBCF-44CA-A922-0B257F55DE0D}
 		{B379640E-9064-438D-8DA5-6F7B394C2C46} = {4AC28EC2-FBCF-44CA-A922-0B257F55DE0D}
 	EndGlobalSection

diff --git a/build.cmd b/build.cmd
@@ -2,7 +2,7 @@
 pushd %~dp0
 setlocal
 
-if exist bin goto build
+if exist bin goto Build
 mkdir bin
 
 :Build
@@ -15,12 +15,12 @@ if not exist %MSBuild% @set MSBuild="%ProgramFiles%\MSBuild\12.0\Bin\MSBuild.exe
 
 if "%1" == "" goto BuildDefaults
 
-%MSBuild% DomainFramework.msbuild /m /nr:false /t:%* /p:Platform="Any CPU" /p:Desktop=true /v:M /fl /flp:LogFile=bin\msbuild.log;Verbosity=Normal
+%MSBuild% RESTier.msbuild /m /nr:false /t:%* /p:Platform="Any CPU" /p:Desktop=true /v:M /fl /flp:LogFile=bin\msbuild.log;Verbosity=Normal
 if %ERRORLEVEL% neq 0 goto BuildFail
 goto BuildSuccess
 
 :BuildDefaults
-%MSBuild% DomainFramework.msbuild /m /nr:false /p:Platform="Any CPU" /p:Desktop=true /v:M /fl /flp:LogFile=bin\msbuild.log;Verbosity=Normal
+%MSBuild% RESTier.msbuild /m /nr:false /p:Platform="Any CPU" /p:Desktop=true /v:M /fl /flp:LogFile=bin\msbuild.log;Verbosity=Normal
 if %ERRORLEVEL% neq 0 goto BuildFail
 goto BuildSuccess
 
@@ -32,7 +32,7 @@ goto End
 :BuildSuccess
 echo.
 echo **** BUILD SUCCESSFUL ***
-goto end
+goto End
 
 :End
 popd

diff --git a/src/CommonAssemblyInfo.cs b/src/CommonAssemblyInfo.cs
@@ -1,22 +1,5 @@
-// Domain Framework ver. 1.0
-// Copyright (c) Microsoft Corporation
-// All rights reserved.
-// MIT License
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
-// associated documentation files (the "Software"), to deal in the Software without restriction,
-// including without limitation the rights to use, copy, modify, merge, publish, distribute,
-// sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all copies or substantial
-// portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-// NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
-// OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+// Licensed under the MIT License.  See License.txt in the project root for license information.
 
 using System;
 using System.Reflection;

diff --git a/src/Microsoft.Data.Domain.Conventions/Conventions/ConventionalChangeSetAuthorizer.cs b/src/Microsoft.Data.Domain.Conventions/Conventions/ConventionalChangeSetAuthorizer.cs
@@ -1,22 +1,5 @@
-// Domain Framework ver. 1.0
-// Copyright (c) Microsoft Corporation
-// All rights reserved.
-// MIT License
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
-// associated documentation files (the "Software"), to deal in the Software without restriction,
-// including without limitation the rights to use, copy, modify, merge, publish, distribute,
-// sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all copies or substantial
-// portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-// NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
-// OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+// Licensed under the MIT License.  See License.txt in the project root for license information.
 
 using System;
 using System.Reflection;

diff --git a/src/Microsoft.Data.Domain.Conventions/Conventions/ConventionalChangeSetEntryFilter.cs b/src/Microsoft.Data.Domain.Conventions/Conventions/ConventionalChangeSetEntryFilter.cs
@@ -1,22 +1,5 @@
-// Domain Framework ver. 1.0
-// Copyright (c) Microsoft Corporation
-// All rights reserved.
-// MIT License
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
-// associated documentation files (the "Software"), to deal in the Software without restriction,
-// including without limitation the rights to use, copy, modify, merge, publish, distribute,
-// sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all copies or substantial
-// portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-// NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
-// OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+// Licensed under the MIT License.  See License.txt in the project root for license information.
 
 using System;
 using System.Reflection;

diff --git a/src/Microsoft.Data.Domain.Conventions/Conventions/ConventionalChangeSetEntryValidator.cs b/src/Microsoft.Data.Domain.Conventions/Conventions/ConventionalChangeSetEntryValidator.cs
@@ -1,22 +1,5 @@
-// Domain Framework ver. 1.0
-// Copyright (c) Microsoft Corporation
-// All rights reserved.
-// MIT License
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
-// associated documentation files (the "Software"), to deal in the Software without restriction,
-// including without limitation the rights to use, copy, modify, merge, publish, distribute,
-// sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all copies or substantial
-// portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-// NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
-// OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+// Licensed under the MIT License.  See License.txt in the project root for license information.
 
 using System;
 using System.ComponentModel;

diff --git a/src/Microsoft.Data.Domain.Conventions/Conventions/ConventionalEntitySetFilter.cs b/src/Microsoft.Data.Domain.Conventions/Conventions/ConventionalEntitySetFilter.cs
@@ -1,22 +1,5 @@
-// Domain Framework ver. 1.0
-// Copyright (c) Microsoft Corporation
-// All rights reserved.
-// MIT License
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
-// associated documentation files (the "Software"), to deal in the Software without restriction,
-// including without limitation the rights to use, copy, modify, merge, publish, distribute,
-// sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all copies or substantial
-// portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-// NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
-// OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+// Licensed under the MIT License.  See License.txt in the project root for license information.
 
 using System;
 using System.Linq;

diff --git a/src/Microsoft.Data.Domain.Conventions/Conventions/ConventionalEntitySetProvider.cs b/src/Microsoft.Data.Domain.Conventions/Conventions/ConventionalEntitySetProvider.cs
@@ -1,22 +1,5 @@
-// Domain Framework ver. 1.0
-// Copyright (c) Microsoft Corporation
-// All rights reserved.
-// MIT License
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
-// associated documentation files (the "Software"), to deal in the Software without restriction,
-// including without limitation the rights to use, copy, modify, merge, publish, distribute,
-// sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all copies or substantial
-// portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-// NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
-// OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+// Licensed under the MIT License.  See License.txt in the project root for license information.
 
 using System;
 using System.Collections.Generic;

diff --git a/src/Microsoft.Data.Domain.Conventions/DomainConfigurationExtensions.cs b/src/Microsoft.Data.Domain.Conventions/DomainConfigurationExtensions.cs
@@ -1,22 +1,5 @@
-// Domain Framework ver. 1.0
-// Copyright (c) Microsoft Corporation
-// All rights reserved.
-// MIT License
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
-// associated documentation files (the "Software"), to deal in the Software without restriction,
-// including without limitation the rights to use, copy, modify, merge, publish, distribute,
-// sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all copies or substantial
-// portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-// NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
-// OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+// Licensed under the MIT License.  See License.txt in the project root for license information.
 
 using System;
 

diff --git a/src/Microsoft.Data.Domain.Conventions/EnableConventionsAttribute.cs b/src/Microsoft.Data.Domain.Conventions/EnableConventionsAttribute.cs
@@ -1,22 +1,5 @@
-// Domain Framework ver. 1.0
-// Copyright (c) Microsoft Corporation
-// All rights reserved.
-// MIT License
-// 
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
-// associated documentation files (the "Software"), to deal in the Software without restriction,
-// including without limitation the rights to use, copy, modify, merge, publish, distribute,
-// sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-// 
-// The above copyright notice and this permission notice shall be included in all copies or substantial
-// portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
-// NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
-// OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-// CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// Copyright (c) Microsoft Corporation.  All rights reserved.
+// Licensed under the MIT License.  See License.txt in the project root for license information.
 
 using System;
 

diff --git a/src/Microsoft.Data.Domain.Conventions/Microsoft.Data.Domain.Conventions.csproj b/src/Microsoft.Data.Domain.Conventions/Microsoft.Data.Domain.Conventions.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),DomainFramework.sln))\tools\DF.settings.targets" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),RESTier.sln))\tools\RESTier.settings.targets" />
   <PropertyGroup>
     <ProjectGuid>{5A10C8BB-5CA0-4D41-A731-45CD29A30D34}</ProjectGuid>
     <OutputType>Library</OutputType>