diff --git a/Universe.sln b/Universe.sln
index 054ec798f0..c4f59d60fe 100644
--- a/Universe.sln
+++ b/Universe.sln
@@ -22,10 +22,6 @@ Global
 		{B0621D49-4770-4552-9425-D6BD2CF0FB50}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B0621D49-4770-4552-9425-D6BD2CF0FB50}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B0621D49-4770-4552-9425-D6BD2CF0FB50}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0DC180DF-D87B-448A-BCDE-2A648F41103E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0DC180DF-D87B-448A-BCDE-2A648F41103E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0DC180DF-D87B-448A-BCDE-2A648F41103E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0DC180DF-D87B-448A-BCDE-2A648F41103E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{DACA9DFB-508E-45EA-A5CF-C0F5C2BA181B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{DACA9DFB-508E-45EA-A5CF-C0F5C2BA181B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DACA9DFB-508E-45EA-A5CF-C0F5C2BA181B}.Release|Any CPU.ActiveCfg = Release|Any CPU
diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets
index 3010138431..2e3a5d25c3 100644
--- a/build/RepositoryBuild.targets
+++ b/build/RepositoryBuild.targets
@@ -26,37 +26,19 @@
 
   <Target Name="_BuildRepository" DependsOnTargets="_PinVersions">
     <PropertyGroup>
-      <RepositoryKoreBuildDirectory>$(BuildRepositoryRoot).build\</RepositoryKoreBuildDirectory>
+      <BuildArguments>$(_RepositoryBuildTargets) /p:BuildNumber=$(BuildNumber) /p:Configuration=$(Configuration)</BuildArguments>
       <RepositoryArtifactsDirectory>$(BuildRepositoryRoot)artifacts\build\</RepositoryArtifactsDirectory>
+
+      <_BuildScriptToExecute Condition="'$(OS)'!='Windows_NT'">build.sh</_BuildScriptToExecute>
+      <_BuildScriptToExecute Condition="'$(OS)'=='Windows_NT'">build.cmd</_BuildScriptToExecute>
     </PropertyGroup>
 
-    <ItemGroup>
-      <KoreBuildFiles Include="$(KoreBuildDirectory)**\*" />
-    </ItemGroup>
-
     <Message Text="============ Building $(RepositoryToBuild) ============" Importance="High" />
-    <Copy SourceFiles="@(KoreBuildFiles)" DestinationFolder="$(RepositoryKoreBuildDirectory)%(RecursiveDir)" />
 
-    <ItemGroup>
-      <RepositoryKoreBuildProject Include="$(RepositoryKoreBuildDirectory)$(KoreBuildProject)">
-        <AdditionalProperties>
-          RepositoryRoot=$(BuildRepositoryRoot);
-          BuildNumber=$(BuildNumber);
-          Configuration=$(Configuration)
-        </AdditionalProperties>
-      </RepositoryKoreBuildProject>
-    </ItemGroup>
-
-    <MSBuild
-      Projects="@(RepositoryKoreBuildProject)"
-      Targets="Restore"
-      Properties="PreflightRestore=true"
-      UnloadProjectsOnCompletion="true" />
-
-    <MSBuild
-      Projects="@(RepositoryKoreBuildProject)"
-      Targets="$(_RepositoryBuildTargets)"
-      UnloadProjectsOnCompletion="true"  />
+    <Exec
+      Command="./$(_BuildScriptToExecute) $(BuildArguments)"
+      EnvironmentVariables="KOREBUILD_SKIP_RUNTIME_INSTALL=1"
+      WorkingDirectory="$(BuildRepositoryRoot)" />
 
     <ItemGroup>
       <RepositoryArtifacts Include="$(RepositoryArtifactsDirectory)*" />
diff --git a/build/repo.targets b/build/repo.targets
index b1c1b42336..08b47f286e 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -10,8 +10,8 @@
     <_DependencyRepositoryList>$(_DependencyBuildDirectory)$(_RepositoryListFileName)</_DependencyRepositoryList>
     <_RestoreGraphSpecsDirectory>$(RepositoryRoot)obj\package-specs\</_RestoreGraphSpecsDirectory>
 
-    <_RepositoryBuildTargets Condition="'$(_RepositoryBuildTargets)'=='' AND '$(CompileOnly)'=='true'">Package;VerifyPackages</_RepositoryBuildTargets>
-    <_RepositoryBuildTargets Condition="'$(_RepositoryBuildTargets)'==''">Verify</_RepositoryBuildTargets>
+    <_RepositoryBuildTargets Condition="'$(_RepositoryBuildTargets)'=='' AND '$(CompileOnly)'=='true'">/t:Package /t:VerifyPackages</_RepositoryBuildTargets>
+    <_RepositoryBuildTargets Condition="'$(_RepositoryBuildTargets)'==''">/t:Verify</_RepositoryBuildTargets>
 
     <PrepareDependsOn>$(PrepareDependsOn);CleanUniverseArtifacts</PrepareDependsOn>
     <CleanDependsOn>$(CleanDependsOn);CleanUniverseArtifacts</CleanDependsOn>