Move sharedFramework out of managed dir

dotnet · May 2, 2017 · da5f130 · da5f130
1 parent 5faff9a
commit da5f130
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/buildpipeline/Core-Setup-Signing-Windows-BT.json b/buildpipeline/Core-Setup-Signing-Windows-BT.json
@@ -222,7 +222,7 @@
         "definitionType": "task"
       },
       "inputs": {
-        "solution": "$(PB_SourcesDirectory)\\src\\managed\\sharedFramework.proj",
+        "solution": "$(PB_SourcesDirectory)\\src\\sharedFramework\\sharedFramework.proj",
         "platform": "$(PB_TargetArchitecture)",
         "configuration": "$(BuildConfiguration)",
         "msbuildArguments": "$(PB_CommonMSBuildArgs) /flp:v=detailed;LogFile=$(PB_SourcesDirectory)\\sharedframework.log",

diff --git a/src/dir.proj b/src/dir.proj
@@ -10,7 +10,7 @@
   <ItemGroup>
     <Project Include="$(MSBuildThisFileDirectory)src.builds" />
     <Project Include="$(MSBuildThisFileDirectory)pkg/dir.proj" />
-    <Project Include="$(MSBuildThisFileDirectory)managed/sharedFramework.proj" />
+    <Project Include="$(MSBuildThisFileDirectory)sharedFramework/sharedFramework.proj" />
   </ItemGroup>
 
   <!-- Tasks from buildtools for easy project.json dependency updates -->

diff --git a/...aged/sharedframework/framework/Program.cs → src/sharedFramework/framework/Program.cs b/...aged/sharedframework/framework/Program.cs → src/sharedFramework/framework/Program.cs
diff --git a/...framework/framework/project.json.template → ...Framework/framework/project.json.template b/...framework/framework/project.json.template → ...Framework/framework/project.json.template
diff --git a/src/managed/sharedFramework.proj → src/sharedFramework/sharedFramework.proj b/src/managed/sharedFramework.proj → src/sharedFramework/sharedFramework.proj
@@ -76,7 +76,7 @@
     <!-- Generate .version file -->
     <ItemGroup>
       <VersionLines Include="$(LatestCommit)" />
-      <VersionLines Include="$(HostFullVersion)" />      
+      <VersionLines Include="$(HostFullVersion)" />
     </ItemGroup>
 
     <WriteLinesToFile
@@ -171,10 +171,10 @@
              Directories="$(IntermediateOutputRootPath)sharedFramework;$(SharedFrameworkSourceRoot)" />
 
     <ItemGroup>
-      <SharedFrameworkFiles Include="$(MSBuildThisFileDirectory)sharedframework\**\*.cs" />
+      <SharedFrameworkFiles Include="$(MSBuildThisFileDirectory)**\*.cs" />
     </ItemGroup>
     <PropertyGroup>
-      <SharedFrameworkTemplate>$(MSBuildThisFileDirectory)sharedframework\framework\project.json.template</SharedFrameworkTemplate>
+      <SharedFrameworkTemplate>$(MSBuildThisFileDirectory)framework\project.json.template</SharedFrameworkTemplate>
     </PropertyGroup>
 
     <Copy SourceFiles="@(SharedFrameworkFiles)" DestinationFolder="$(SharedFrameworkSourceRoot)"/>