Skip to content

Commit

Permalink
Upgrade to VS 2017
Browse files Browse the repository at this point in the history
  • Loading branch information
Nate McMaster committed Dec 13, 2016
1 parent 7f91e9e commit 2cb4f74
Show file tree
Hide file tree
Showing 42 changed files with 487 additions and 541 deletions.
125 changes: 112 additions & 13 deletions BuildTools.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.25420.1
# Visual Studio 15
VisualStudioVersion = 15.0.26009.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A4F4353B-C3D2-40B0-909A-5B48A748EA76}"
EndProject
Expand All @@ -10,74 +10,172 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
global.json = global.json
EndProjectSection
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NuGetPackageVerifier", "src\NuGetPackageVerifier\NuGetPackageVerifier.xproj", "{657AFF5E-164E-493D-8501-8026B7C20808}"
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{60A938B2-D95A-403C-AA7A-3683AD64DFA0}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SplitPackages", "src\SplitPackages\SplitPackages.xproj", "{C98F7832-85FB-451B-9152-87425ACF8EEB}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGetPackageVerifier", "src\NuGetPackageVerifier\NuGetPackageVerifier.csproj", "{657AFF5E-164E-493D-8501-8026B7C20808}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "DependenciesPackager", "src\DependenciesPackager\DependenciesPackager.xproj", "{183BBD52-FFC3-4636-9C6F-EAFA5CDBFEAB}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SplitPackages", "src\SplitPackages\SplitPackages.csproj", "{C98F7832-85FB-451B-9152-87425ACF8EEB}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PackageClassifier", "src\PackageClassifier\PackageClassifier.xproj", "{5F13329B-48C4-418A-A495-E9F58949C43E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DependenciesPackager", "src\DependenciesPackager\DependenciesPackager.csproj", "{183BBD52-FFC3-4636-9C6F-EAFA5CDBFEAB}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "VersionTool", "src\VersionTool\VersionTool.xproj", "{102216C8-55CB-49EA-B20E-D41B1F0E42B1}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageClassifier", "src\PackageClassifier\PackageClassifier.csproj", "{5F13329B-48C4-418A-A495-E9F58949C43E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{60A938B2-D95A-403C-AA7A-3683AD64DFA0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VersionTool", "src\VersionTool\VersionTool.csproj", "{102216C8-55CB-49EA-B20E-D41B1F0E42B1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiCheckBaseline.V1", "test\ApiCheckBaseline.V1\ApiCheckBaseline.V1.csproj", "{1B1731E0-4ADB-4A04-9418-FCD7F5CFB79E}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ApiCheckBaseline.V1", "test\ApiCheckBaseline.V1\ApiCheckBaseline.V1.xproj", "{1B1731E0-4ADB-4A04-9418-FCD7F5CFB79E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiCheckBaseline.V2", "test\ApiCheckBaseline.V2\ApiCheckBaseline.V2.csproj", "{ECA89839-3332-43F3-B1B1-9C2D91B7285E}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ApiCheckBaseline.V2", "test\ApiCheckBaseline.V2\ApiCheckBaseline.V2.xproj", "{ECA89839-3332-43F3-B1B1-9C2D91B7285E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiCheck.Test", "test\ApiCheck.Test\ApiCheck.Test.csproj", "{D61A892B-D214-44AB-9652-334C4338377B}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ApiCheck.Test", "test\ApiCheck.Test\ApiCheck.Test.xproj", "{D61A892B-D214-44AB-9652-334C4338377B}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.BuildTools.ApiCheck", "src\Microsoft.AspNetCore.BuildTools.ApiCheck\Microsoft.AspNetCore.BuildTools.ApiCheck.csproj", "{AEFC7985-27C8-468E-8EF8-E1D589C9053F}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.BuildTools.ApiCheck", "src\Microsoft.AspNetCore.BuildTools.ApiCheck\Microsoft.AspNetCore.BuildTools.ApiCheck.xproj", "{AEFC7985-27C8-468E-8EF8-E1D589C9053F}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGetPackageVerifier.Task", "src\NuGetPackageVerifier.Task\NuGetPackageVerifier.Task.csproj", "{EF38C1CA-8A2E-4C8E-B478-7072C0140514}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NuGetPackageVerifier.Task", "src\NuGetPackageVerifier.Task\NuGetPackageVerifier.Task.xproj", "{EF38C1CA-8A2E-4C8E-B478-7072C0140514}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageCacheUploader", "src\PackageCacheUploader\PackageCacheUploader.csproj", "{EBC0BF3F-14B4-4595-980D-D4D738043D59}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{657AFF5E-164E-493D-8501-8026B7C20808}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{657AFF5E-164E-493D-8501-8026B7C20808}.Debug|Any CPU.Build.0 = Debug|Any CPU
{657AFF5E-164E-493D-8501-8026B7C20808}.Debug|x64.ActiveCfg = Debug|x64
{657AFF5E-164E-493D-8501-8026B7C20808}.Debug|x64.Build.0 = Debug|x64
{657AFF5E-164E-493D-8501-8026B7C20808}.Debug|x86.ActiveCfg = Debug|x86
{657AFF5E-164E-493D-8501-8026B7C20808}.Debug|x86.Build.0 = Debug|x86
{657AFF5E-164E-493D-8501-8026B7C20808}.Release|Any CPU.ActiveCfg = Release|Any CPU
{657AFF5E-164E-493D-8501-8026B7C20808}.Release|Any CPU.Build.0 = Release|Any CPU
{657AFF5E-164E-493D-8501-8026B7C20808}.Release|x64.ActiveCfg = Release|x64
{657AFF5E-164E-493D-8501-8026B7C20808}.Release|x64.Build.0 = Release|x64
{657AFF5E-164E-493D-8501-8026B7C20808}.Release|x86.ActiveCfg = Release|x86
{657AFF5E-164E-493D-8501-8026B7C20808}.Release|x86.Build.0 = Release|x86
{C98F7832-85FB-451B-9152-87425ACF8EEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C98F7832-85FB-451B-9152-87425ACF8EEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C98F7832-85FB-451B-9152-87425ACF8EEB}.Debug|x64.ActiveCfg = Debug|x64
{C98F7832-85FB-451B-9152-87425ACF8EEB}.Debug|x64.Build.0 = Debug|x64
{C98F7832-85FB-451B-9152-87425ACF8EEB}.Debug|x86.ActiveCfg = Debug|x86
{C98F7832-85FB-451B-9152-87425ACF8EEB}.Debug|x86.Build.0 = Debug|x86
{C98F7832-85FB-451B-9152-87425ACF8EEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C98F7832-85FB-451B-9152-87425ACF8EEB}.Release|Any CPU.Build.0 = Release|Any CPU
{C98F7832-85FB-451B-9152-87425ACF8EEB}.Release|x64.ActiveCfg = Release|x64
{C98F7832-85FB-451B-9152-87425ACF8EEB}.Release|x64.Build.0 = Release|x64
{C98F7832-85FB-451B-9152-87425ACF8EEB}.Release|x86.ActiveCfg = Release|x86
{C98F7832-85FB-451B-9152-87425ACF8EEB}.Release|x86.Build.0 = Release|x86
{183BBD52-FFC3-4636-9C6F-EAFA5CDBFEAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{183BBD52-FFC3-4636-9C6F-EAFA5CDBFEAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{183BBD52-FFC3-4636-9C6F-EAFA5CDBFEAB}.Debug|x64.ActiveCfg = Debug|x64
{183BBD52-FFC3-4636-9C6F-EAFA5CDBFEAB}.Debug|x64.Build.0 = Debug|x64
{183BBD52-FFC3-4636-9C6F-EAFA5CDBFEAB}.Debug|x86.ActiveCfg = Debug|x86
{183BBD52-FFC3-4636-9C6F-EAFA5CDBFEAB}.Debug|x86.Build.0 = Debug|x86
{183BBD52-FFC3-4636-9C6F-EAFA5CDBFEAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{183BBD52-FFC3-4636-9C6F-EAFA5CDBFEAB}.Release|Any CPU.Build.0 = Release|Any CPU
{183BBD52-FFC3-4636-9C6F-EAFA5CDBFEAB}.Release|x64.ActiveCfg = Release|x64
{183BBD52-FFC3-4636-9C6F-EAFA5CDBFEAB}.Release|x64.Build.0 = Release|x64
{183BBD52-FFC3-4636-9C6F-EAFA5CDBFEAB}.Release|x86.ActiveCfg = Release|x86
{183BBD52-FFC3-4636-9C6F-EAFA5CDBFEAB}.Release|x86.Build.0 = Release|x86
{5F13329B-48C4-418A-A495-E9F58949C43E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5F13329B-48C4-418A-A495-E9F58949C43E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5F13329B-48C4-418A-A495-E9F58949C43E}.Debug|x64.ActiveCfg = Debug|x64
{5F13329B-48C4-418A-A495-E9F58949C43E}.Debug|x64.Build.0 = Debug|x64
{5F13329B-48C4-418A-A495-E9F58949C43E}.Debug|x86.ActiveCfg = Debug|x86
{5F13329B-48C4-418A-A495-E9F58949C43E}.Debug|x86.Build.0 = Debug|x86
{5F13329B-48C4-418A-A495-E9F58949C43E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5F13329B-48C4-418A-A495-E9F58949C43E}.Release|Any CPU.Build.0 = Release|Any CPU
{5F13329B-48C4-418A-A495-E9F58949C43E}.Release|x64.ActiveCfg = Release|x64
{5F13329B-48C4-418A-A495-E9F58949C43E}.Release|x64.Build.0 = Release|x64
{5F13329B-48C4-418A-A495-E9F58949C43E}.Release|x86.ActiveCfg = Release|x86
{5F13329B-48C4-418A-A495-E9F58949C43E}.Release|x86.Build.0 = Release|x86
{102216C8-55CB-49EA-B20E-D41B1F0E42B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{102216C8-55CB-49EA-B20E-D41B1F0E42B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
{102216C8-55CB-49EA-B20E-D41B1F0E42B1}.Debug|x64.ActiveCfg = Debug|x64
{102216C8-55CB-49EA-B20E-D41B1F0E42B1}.Debug|x64.Build.0 = Debug|x64
{102216C8-55CB-49EA-B20E-D41B1F0E42B1}.Debug|x86.ActiveCfg = Debug|x86
{102216C8-55CB-49EA-B20E-D41B1F0E42B1}.Debug|x86.Build.0 = Debug|x86
{102216C8-55CB-49EA-B20E-D41B1F0E42B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{102216C8-55CB-49EA-B20E-D41B1F0E42B1}.Release|Any CPU.Build.0 = Release|Any CPU
{102216C8-55CB-49EA-B20E-D41B1F0E42B1}.Release|x64.ActiveCfg = Release|x64
{102216C8-55CB-49EA-B20E-D41B1F0E42B1}.Release|x64.Build.0 = Release|x64
{102216C8-55CB-49EA-B20E-D41B1F0E42B1}.Release|x86.ActiveCfg = Release|x86
{102216C8-55CB-49EA-B20E-D41B1F0E42B1}.Release|x86.Build.0 = Release|x86
{1B1731E0-4ADB-4A04-9418-FCD7F5CFB79E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1B1731E0-4ADB-4A04-9418-FCD7F5CFB79E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1B1731E0-4ADB-4A04-9418-FCD7F5CFB79E}.Debug|x64.ActiveCfg = Debug|x64
{1B1731E0-4ADB-4A04-9418-FCD7F5CFB79E}.Debug|x64.Build.0 = Debug|x64
{1B1731E0-4ADB-4A04-9418-FCD7F5CFB79E}.Debug|x86.ActiveCfg = Debug|x86
{1B1731E0-4ADB-4A04-9418-FCD7F5CFB79E}.Debug|x86.Build.0 = Debug|x86
{1B1731E0-4ADB-4A04-9418-FCD7F5CFB79E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1B1731E0-4ADB-4A04-9418-FCD7F5CFB79E}.Release|Any CPU.Build.0 = Release|Any CPU
{1B1731E0-4ADB-4A04-9418-FCD7F5CFB79E}.Release|x64.ActiveCfg = Release|x64
{1B1731E0-4ADB-4A04-9418-FCD7F5CFB79E}.Release|x64.Build.0 = Release|x64
{1B1731E0-4ADB-4A04-9418-FCD7F5CFB79E}.Release|x86.ActiveCfg = Release|x86
{1B1731E0-4ADB-4A04-9418-FCD7F5CFB79E}.Release|x86.Build.0 = Release|x86
{ECA89839-3332-43F3-B1B1-9C2D91B7285E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{ECA89839-3332-43F3-B1B1-9C2D91B7285E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ECA89839-3332-43F3-B1B1-9C2D91B7285E}.Debug|x64.ActiveCfg = Debug|x64
{ECA89839-3332-43F3-B1B1-9C2D91B7285E}.Debug|x64.Build.0 = Debug|x64
{ECA89839-3332-43F3-B1B1-9C2D91B7285E}.Debug|x86.ActiveCfg = Debug|x86
{ECA89839-3332-43F3-B1B1-9C2D91B7285E}.Debug|x86.Build.0 = Debug|x86
{ECA89839-3332-43F3-B1B1-9C2D91B7285E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ECA89839-3332-43F3-B1B1-9C2D91B7285E}.Release|Any CPU.Build.0 = Release|Any CPU
{ECA89839-3332-43F3-B1B1-9C2D91B7285E}.Release|x64.ActiveCfg = Release|x64
{ECA89839-3332-43F3-B1B1-9C2D91B7285E}.Release|x64.Build.0 = Release|x64
{ECA89839-3332-43F3-B1B1-9C2D91B7285E}.Release|x86.ActiveCfg = Release|x86
{ECA89839-3332-43F3-B1B1-9C2D91B7285E}.Release|x86.Build.0 = Release|x86
{D61A892B-D214-44AB-9652-334C4338377B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D61A892B-D214-44AB-9652-334C4338377B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D61A892B-D214-44AB-9652-334C4338377B}.Debug|x64.ActiveCfg = Debug|x64
{D61A892B-D214-44AB-9652-334C4338377B}.Debug|x64.Build.0 = Debug|x64
{D61A892B-D214-44AB-9652-334C4338377B}.Debug|x86.ActiveCfg = Debug|x86
{D61A892B-D214-44AB-9652-334C4338377B}.Debug|x86.Build.0 = Debug|x86
{D61A892B-D214-44AB-9652-334C4338377B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D61A892B-D214-44AB-9652-334C4338377B}.Release|Any CPU.Build.0 = Release|Any CPU
{D61A892B-D214-44AB-9652-334C4338377B}.Release|x64.ActiveCfg = Release|x64
{D61A892B-D214-44AB-9652-334C4338377B}.Release|x64.Build.0 = Release|x64
{D61A892B-D214-44AB-9652-334C4338377B}.Release|x86.ActiveCfg = Release|x86
{D61A892B-D214-44AB-9652-334C4338377B}.Release|x86.Build.0 = Release|x86
{AEFC7985-27C8-468E-8EF8-E1D589C9053F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AEFC7985-27C8-468E-8EF8-E1D589C9053F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AEFC7985-27C8-468E-8EF8-E1D589C9053F}.Debug|x64.ActiveCfg = Debug|x64
{AEFC7985-27C8-468E-8EF8-E1D589C9053F}.Debug|x64.Build.0 = Debug|x64
{AEFC7985-27C8-468E-8EF8-E1D589C9053F}.Debug|x86.ActiveCfg = Debug|x86
{AEFC7985-27C8-468E-8EF8-E1D589C9053F}.Debug|x86.Build.0 = Debug|x86
{AEFC7985-27C8-468E-8EF8-E1D589C9053F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AEFC7985-27C8-468E-8EF8-E1D589C9053F}.Release|Any CPU.Build.0 = Release|Any CPU
{AEFC7985-27C8-468E-8EF8-E1D589C9053F}.Release|x64.ActiveCfg = Release|x64
{AEFC7985-27C8-468E-8EF8-E1D589C9053F}.Release|x64.Build.0 = Release|x64
{AEFC7985-27C8-468E-8EF8-E1D589C9053F}.Release|x86.ActiveCfg = Release|x86
{AEFC7985-27C8-468E-8EF8-E1D589C9053F}.Release|x86.Build.0 = Release|x86
{EF38C1CA-8A2E-4C8E-B478-7072C0140514}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EF38C1CA-8A2E-4C8E-B478-7072C0140514}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EF38C1CA-8A2E-4C8E-B478-7072C0140514}.Debug|x64.ActiveCfg = Debug|x64
{EF38C1CA-8A2E-4C8E-B478-7072C0140514}.Debug|x64.Build.0 = Debug|x64
{EF38C1CA-8A2E-4C8E-B478-7072C0140514}.Debug|x86.ActiveCfg = Debug|x86
{EF38C1CA-8A2E-4C8E-B478-7072C0140514}.Debug|x86.Build.0 = Debug|x86
{EF38C1CA-8A2E-4C8E-B478-7072C0140514}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EF38C1CA-8A2E-4C8E-B478-7072C0140514}.Release|Any CPU.Build.0 = Release|Any CPU
{EF38C1CA-8A2E-4C8E-B478-7072C0140514}.Release|x64.ActiveCfg = Release|x64
{EF38C1CA-8A2E-4C8E-B478-7072C0140514}.Release|x64.Build.0 = Release|x64
{EF38C1CA-8A2E-4C8E-B478-7072C0140514}.Release|x86.ActiveCfg = Release|x86
{EF38C1CA-8A2E-4C8E-B478-7072C0140514}.Release|x86.Build.0 = Release|x86
{EBC0BF3F-14B4-4595-980D-D4D738043D59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EBC0BF3F-14B4-4595-980D-D4D738043D59}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EBC0BF3F-14B4-4595-980D-D4D738043D59}.Debug|x64.ActiveCfg = Debug|x64
{EBC0BF3F-14B4-4595-980D-D4D738043D59}.Debug|x64.Build.0 = Debug|x64
{EBC0BF3F-14B4-4595-980D-D4D738043D59}.Debug|x86.ActiveCfg = Debug|x86
{EBC0BF3F-14B4-4595-980D-D4D738043D59}.Debug|x86.Build.0 = Debug|x86
{EBC0BF3F-14B4-4595-980D-D4D738043D59}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EBC0BF3F-14B4-4595-980D-D4D738043D59}.Release|Any CPU.Build.0 = Release|Any CPU
{EBC0BF3F-14B4-4595-980D-D4D738043D59}.Release|x64.ActiveCfg = Release|x64
{EBC0BF3F-14B4-4595-980D-D4D738043D59}.Release|x64.Build.0 = Release|x64
{EBC0BF3F-14B4-4595-980D-D4D738043D59}.Release|x86.ActiveCfg = Release|x86
{EBC0BF3F-14B4-4595-980D-D4D738043D59}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -93,5 +191,6 @@ Global
{D61A892B-D214-44AB-9652-334C4338377B} = {60A938B2-D95A-403C-AA7A-3683AD64DFA0}
{AEFC7985-27C8-468E-8EF8-E1D589C9053F} = {A4F4353B-C3D2-40B0-909A-5B48A748EA76}
{EF38C1CA-8A2E-4C8E-B478-7072C0140514} = {A4F4353B-C3D2-40B0-909A-5B48A748EA76}
{EBC0BF3F-14B4-4595-980D-D4D738043D59} = {A4F4353B-C3D2-40B0-909A-5B48A748EA76}
EndGlobalSection
EndGlobal
14 changes: 7 additions & 7 deletions build.ps1
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$ErrorActionPreference = "Stop"

function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $retries)
function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $retries)
{
while($true)
{
Expand All @@ -19,7 +19,7 @@ function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $ret
Start-Sleep -Seconds 10

}
else
else
{
$exception = $_.Exception
throw $exception
Expand All @@ -33,7 +33,7 @@ cd $PSScriptRoot
$repoFolder = $PSScriptRoot
$env:REPO_FOLDER = $repoFolder

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

if (!(Test-Path $buildFolder)) {
Write-Host "Downloading KoreBuild from $koreBuildZip"
Write-Host "Downloading KoreBuild from $koreBuildZip"

$tempFolder=$env:TEMP + "\KoreBuild-" + [guid]::NewGuid()
New-Item -Path "$tempFolder" -Type directory | Out-Null

$localZipFile="$tempFolder\korebuild.zip"

DownloadWithRetry -url $koreBuildZip -downloadLocation $localZipFile -retries 6

Add-Type -AssemblyName System.IO.Compression.FileSystem
[System.IO.Compression.ZipFile]::ExtractToDirectory($localZipFile, $tempFolder)

New-Item -Path "$buildFolder" -Type directory | Out-Null
copy-item "$tempFolder\**\build\*" $buildFolder -Recurse

Expand Down
22 changes: 11 additions & 11 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
cd $repoFolder

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

if test ! -d $buildFolder; then
echo "Downloading KoreBuild from $koreBuildZip"
tempFolder="/tmp/KoreBuild-$(uuidgen)"

tempFolder="/tmp/KoreBuild-$(uuidgen)"
mkdir $tempFolder

localZipFile="$tempFolder/korebuild.zip"

retries=6
until (wget -O $localZipFile $koreBuildZip 2>/dev/null || curl -o $localZipFile --location $koreBuildZip 2>/dev/null)
do
Expand All @@ -29,17 +29,17 @@ if test ! -d $buildFolder; then
echo "Waiting 10 seconds before retrying. Retries left: $retries"
sleep 10s
done

unzip -q -d $tempFolder $localZipFile

mkdir $buildFolder
cp -r $tempFolder/**/build/** $buildFolder

chmod +x $buildFile

# Cleanup
if test ! -d $tempFolder; then
rm -rf $tempFolder
if test -d $tempFolder; then
rm -rf $tempFolder
fi
fi

Expand Down
9 changes: 9 additions & 0 deletions dir.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Project>
<Import Project="version.props" />
<Import Project=".build\common.props" Condition="Exists('.build\common.props')"/>

<Target Name="EnsureInitialized" BeforeTargets="Build" Condition="!Exists('$(MSBuildThisFileDirectory)\.build\common.props')">
<Error File="$(MSBuildProjectFile)"
Text="Project has not been initialized. Run 'build initialize' in the solution directory '$(MSBuildThisFileDirectory)'" />
</Target>
</Project>
Loading

0 comments on commit 2cb4f74

Please sign in to comment.