Skip to content

Commit 821ad85

Browse files
natemcmasterSteveSandersonMS
natemcmaster
authored and
SteveSandersonMS
committed
Fixup MSBuild conversion (aspnet#721)
* Replace makefile.shade with repo.targets * Remove web site projects as these are not yet supported by MSBuild for .NET Core cref dotnet/msbuild#1767
1 parent 76ae9aa commit 821ad85

File tree

5 files changed

+31
-87
lines changed

5 files changed

+31
-87
lines changed

‎JavaScriptServices.sln‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -56,50 +56,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactReduxSpa", "templates\
5656
EndProject
5757
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApplicationBasic", "templates\WebApplicationBasic\WebApplicationBasic.csproj", "{86911E07-C733-4C18-B49F-9A007A651246}"
5858
EndProject
59-
Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "package-builder", "templates\package-builder\", "{1389D9BF-402E-4639-8573-8340EFB8FBD0}"
60-
ProjectSection(WebsiteProperties) = preProject
61-
TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
62-
Debug.AspNetCompiler.VirtualPath = "/localhost_57758"
63-
Debug.AspNetCompiler.PhysicalPath = "templates\package-builder\"
64-
Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_57758\"
65-
Debug.AspNetCompiler.Updateable = "true"
66-
Debug.AspNetCompiler.ForceOverwrite = "true"
67-
Debug.AspNetCompiler.FixedNames = "false"
68-
Debug.AspNetCompiler.Debug = "True"
69-
Release.AspNetCompiler.VirtualPath = "/localhost_57758"
70-
Release.AspNetCompiler.PhysicalPath = "templates\package-builder\"
71-
Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_57758\"
72-
Release.AspNetCompiler.Updateable = "true"
73-
Release.AspNetCompiler.ForceOverwrite = "true"
74-
Release.AspNetCompiler.FixedNames = "false"
75-
Release.AspNetCompiler.Debug = "False"
76-
VWDPort = "57758"
77-
SlnRelativePath = "templates\package-builder\"
78-
EndProjectSection
79-
EndProject
80-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{BDE761D9-8E1C-4FB1-BB86-110393C59176}"
81-
EndProject
82-
Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "test", "test\", "{A01B46C2-53D8-499D-8CDE-68E3E7B52804}"
83-
ProjectSection(WebsiteProperties) = preProject
84-
TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.0"
85-
Debug.AspNetCompiler.VirtualPath = "/localhost_54430"
86-
Debug.AspNetCompiler.PhysicalPath = "test\"
87-
Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_54430\"
88-
Debug.AspNetCompiler.Updateable = "true"
89-
Debug.AspNetCompiler.ForceOverwrite = "true"
90-
Debug.AspNetCompiler.FixedNames = "false"
91-
Debug.AspNetCompiler.Debug = "True"
92-
Release.AspNetCompiler.VirtualPath = "/localhost_54430"
93-
Release.AspNetCompiler.PhysicalPath = "test\"
94-
Release.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_54430\"
95-
Release.AspNetCompiler.Updateable = "true"
96-
Release.AspNetCompiler.ForceOverwrite = "true"
97-
Release.AspNetCompiler.FixedNames = "false"
98-
Release.AspNetCompiler.Debug = "False"
99-
VWDPort = "54430"
100-
SlnRelativePath = "test\"
101-
EndProjectSection
102-
EndProject
10359
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{E415FE14-13B0-469F-836D-95059E6BAA6E}"
10460
ProjectSection(SolutionItems) = preProject
10561
src\build\common.props = src\build\common.props
@@ -180,14 +136,6 @@ Global
180136
{86911E07-C733-4C18-B49F-9A007A651246}.Debug|Any CPU.Build.0 = Debug|Any CPU
181137
{86911E07-C733-4C18-B49F-9A007A651246}.Release|Any CPU.ActiveCfg = Release|Any CPU
182138
{86911E07-C733-4C18-B49F-9A007A651246}.Release|Any CPU.Build.0 = Release|Any CPU
183-
{1389D9BF-402E-4639-8573-8340EFB8FBD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
184-
{1389D9BF-402E-4639-8573-8340EFB8FBD0}.Debug|Any CPU.Build.0 = Debug|Any CPU
185-
{1389D9BF-402E-4639-8573-8340EFB8FBD0}.Release|Any CPU.ActiveCfg = Debug|Any CPU
186-
{1389D9BF-402E-4639-8573-8340EFB8FBD0}.Release|Any CPU.Build.0 = Debug|Any CPU
187-
{A01B46C2-53D8-499D-8CDE-68E3E7B52804}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
188-
{A01B46C2-53D8-499D-8CDE-68E3E7B52804}.Debug|Any CPU.Build.0 = Debug|Any CPU
189-
{A01B46C2-53D8-499D-8CDE-68E3E7B52804}.Release|Any CPU.ActiveCfg = Debug|Any CPU
190-
{A01B46C2-53D8-499D-8CDE-68E3E7B52804}.Release|Any CPU.Build.0 = Debug|Any CPU
191139
EndGlobalSection
192140
GlobalSection(SolutionProperties) = preSolution
193141
HideSolutionNode = FALSE
@@ -213,8 +161,6 @@ Global
213161
{868A630E-C61B-4807-B7A8-7EB53BE1C28A} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D}
214162
{9D4D15A1-A25B-44EC-AB63-F1CE9986712E} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D}
215163
{86911E07-C733-4C18-B49F-9A007A651246} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D}
216-
{1389D9BF-402E-4639-8573-8340EFB8FBD0} = {1598B415-73F1-4B37-B3B4-0A10677ABB2D}
217-
{A01B46C2-53D8-499D-8CDE-68E3E7B52804} = {BDE761D9-8E1C-4FB1-BB86-110393C59176}
218164
{E415FE14-13B0-469F-836D-95059E6BAA6E} = {27304DDE-AFB2-4F8B-B765-E3E2F11E886C}
219165
EndGlobalSection
220166
EndGlobal

‎build.ps1‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
$ErrorActionPreference = "Stop"
22

3-
function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $retries)
3+
function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $retries)
44
{
55
while($true)
66
{
@@ -19,7 +19,7 @@ function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $ret
1919
Start-Sleep -Seconds 10
2020

2121
}
22-
else
22+
else
2323
{
2424
$exception = $_.Exception
2525
throw $exception
@@ -33,7 +33,7 @@ cd $PSScriptRoot
3333
$repoFolder = $PSScriptRoot
3434
$env:REPO_FOLDER = $repoFolder
3535

36-
$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
36+
$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild.zip"
3737
if ($env:KOREBUILD_ZIP)
3838
{
3939
$koreBuildZip=$env:KOREBUILD_ZIP
@@ -43,18 +43,18 @@ $buildFolder = ".build"
4343
$buildFile="$buildFolder\KoreBuild.ps1"
4444

4545
if (!(Test-Path $buildFolder)) {
46-
Write-Host "Downloading KoreBuild from $koreBuildZip"
47-
46+
Write-Host "Downloading KoreBuild from $koreBuildZip"
47+
4848
$tempFolder=$env:TEMP + "\KoreBuild-" + [guid]::NewGuid()
4949
New-Item -Path "$tempFolder" -Type directory | Out-Null
5050

5151
$localZipFile="$tempFolder\korebuild.zip"
52-
52+
5353
DownloadWithRetry -url $koreBuildZip -downloadLocation $localZipFile -retries 6
5454

5555
Add-Type -AssemblyName System.IO.Compression.FileSystem
5656
[System.IO.Compression.ZipFile]::ExtractToDirectory($localZipFile, $tempFolder)
57-
57+
5858
New-Item -Path "$buildFolder" -Type directory | Out-Null
5959
copy-item "$tempFolder\**\build\*" $buildFolder -Recurse
6060

@@ -64,4 +64,4 @@ if (!(Test-Path $buildFolder)) {
6464
}
6565
}
6666

67-
&"$buildFile" $args
67+
&"$buildFile" $args

‎build.sh‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
33
cd $repoFolder
44

5-
koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip"
5+
koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild.zip"
66
if [ ! -z $KOREBUILD_ZIP ]; then
77
koreBuildZip=$KOREBUILD_ZIP
88
fi
@@ -12,12 +12,12 @@ buildFile="$buildFolder/KoreBuild.sh"
1212

1313
if test ! -d $buildFolder; then
1414
echo "Downloading KoreBuild from $koreBuildZip"
15-
16-
tempFolder="/tmp/KoreBuild-$(uuidgen)"
15+
16+
tempFolder="/tmp/KoreBuild-$(uuidgen)"
1717
mkdir $tempFolder
18-
18+
1919
localZipFile="$tempFolder/korebuild.zip"
20-
20+
2121
retries=6
2222
until (wget -O $localZipFile $koreBuildZip 2>/dev/null || curl -o $localZipFile --location $koreBuildZip 2>/dev/null)
2323
do
@@ -29,18 +29,18 @@ if test ! -d $buildFolder; then
2929
echo "Waiting 10 seconds before retrying. Retries left: $retries"
3030
sleep 10s
3131
done
32-
32+
3333
unzip -q -d $tempFolder $localZipFile
34-
34+
3535
mkdir $buildFolder
3636
cp -r $tempFolder/**/build/** $buildFolder
37-
37+
3838
chmod +x $buildFile
39-
39+
4040
# Cleanup
4141
if test ! -d $tempFolder; then
42-
rm -rf $tempFolder
42+
rm -rf $tempFolder
4343
fi
4444
fi
4545

46-
$buildFile -r $repoFolder "$@"
46+
$buildFile -r $repoFolder "$@"

‎build/repo.targets‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<Project>
2+
<Target Name="NpmRestore" AfterTargets="Restore" Condition="'$(PreflightRestore)' != 'true'">
3+
<ItemGroup>
4+
<NpmModules Include="$(RepositoryRoot)**\package.json"
5+
Exclude="$(RepositoryRoot)**\node_modules\**\*" />
6+
</ItemGroup>
7+
8+
<Message Text="Restoring NPM modules for: %0A - @(NpmModules -> '%(FullPath)','%0A - ')" Importance="high" />
9+
10+
<Exec Command="npm install" WorkingDirectory="%(NpmModules.RootDir)%(Directory)" />
11+
</Target>
12+
</Project>

‎makefile.shade‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)