diff --git a/BuildTools.sln b/BuildTools.sln index c3579b059..a2c28698a 100644 --- a/BuildTools.sln +++ b/BuildTools.sln @@ -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 @@ -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 @@ -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 diff --git a/build.ps1 b/build.ps1 index 8f2f99691..f780c43a8 100644 --- a/build.ps1 +++ b/build.ps1 @@ -1,6 +1,6 @@ $ErrorActionPreference = "Stop" -function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $retries) +function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $retries) { while($true) { @@ -19,7 +19,7 @@ function DownloadWithRetry([string] $url, [string] $downloadLocation, [int] $ret Start-Sleep -Seconds 10 } - else + else { $exception = $_.Exception throw $exception @@ -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 @@ -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 diff --git a/build.sh b/build.sh index f4208100e..ff7978919 100755 --- a/build.sh +++ b/build.sh @@ -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 @@ -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 @@ -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 diff --git a/dir.props b/dir.props new file mode 100644 index 000000000..f66abce4f --- /dev/null +++ b/dir.props @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/makefile.shade b/makefile.shade index 6be536ed3..abdb1fe8f 100644 --- a/makefile.shade +++ b/makefile.shade @@ -12,6 +12,12 @@ k-standard-goals #xml-docs-test .clean .build-compile description='Check generated XML documentation files for errors' target='test' k-xml-docs-test +@{/* Workaround https://github.com/dotnet/sdk/issues/423 */} +#re-restore target='initialize' + dotnet command='msbuild src/SplitPackages/SplitPackages.csproj /t:Restore /p:TargetFramework=net451' + dotnet command='msbuild test/ApiCheck.Test/ApiCheck.Test.csproj /t:Restore /p:TargetFramework=net452' + dotnet command='msbuild src/Microsoft.AspNetCore.BuildTools.ApiCheck/Microsoft.AspNetCore.BuildTools.ApiCheck.csproj /t:Restore /p:TargetFramework=net451' + #nuget-pack target='package' @{ var configuration = E("Configuration"); @@ -21,7 +27,7 @@ k-standard-goals { "PackageCacheUploader", new [] { "netcoreapp1.0" } }, { "DependenciesPackager", new [] { "netcoreapp1.0" } }, { "NuGetPackageVerifier", new [] { "netcoreapp1.0" } }, - { "SplitPackages", new [] { "net451" } }, + { "SplitPackages", new [] { "net451" } } }; var outputDir = Path.Combine(TARGET_DIR, "build"); @@ -34,8 +40,7 @@ k-standard-goals var basePath = Path.Combine(publishDir, projectName); foreach (var tfm in item.Value) { - Exec("dotnet", "publish src/" + projectName - + " --no-build" + Exec("dotnet", "publish src/" + projectName + "/" + projectName + ".csproj" + " --framework " + tfm + " --configuration " + configuration + " --output \"" + Path.Combine(basePath, tfm) + "\""); diff --git a/samples/NuGetPackageVerifier.Sample/NuGetPackageVerifier.Sample.proj b/samples/NuGetPackageVerifier.Sample/NuGetPackageVerifier.Sample.proj index f58b2d7ee..8023cc072 100755 --- a/samples/NuGetPackageVerifier.Sample/NuGetPackageVerifier.Sample.proj +++ b/samples/NuGetPackageVerifier.Sample/NuGetPackageVerifier.Sample.proj @@ -4,7 +4,7 @@ netcoreapp1.0 - + diff --git a/src/DependenciesPackager/DependenciesPackager.csproj b/src/DependenciesPackager/DependenciesPackager.csproj new file mode 100644 index 000000000..19d147ed7 --- /dev/null +++ b/src/DependenciesPackager/DependenciesPackager.csproj @@ -0,0 +1,26 @@ + + + + + + Creates a zip package with the expanded version of our nuget packages that can be used as a local cache + 1.0.1 + netcoreapp1.0 + exe + + + + + + + + + + + + + + + + + diff --git a/src/DependenciesPackager/DependenciesPackager.xproj b/src/DependenciesPackager/DependenciesPackager.xproj deleted file mode 100644 index f70d86b0f..000000000 --- a/src/DependenciesPackager/DependenciesPackager.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.25123 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 183bbd52-ffc3-4636-9c6f-eafa5cdbfeab - DependenciesPackager - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/DependenciesPackager/project.json b/src/DependenciesPackager/project.json deleted file mode 100644 index 903a2896c..000000000 --- a/src/DependenciesPackager/project.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "version": "1.0.1-*", - "description": "Creates a zip package with the expanded version of our nuget packages that can be used as a local cache", - "buildOptions": { - "emitEntryPoint": true - }, - "dependencies": { - "Microsoft.Extensions.CommandLineUtils": "1.0.0-*", - "Microsoft.Extensions.Logging": "1.0.0-*", - "Microsoft.Extensions.Logging.Console": "1.0.0-*", - "Microsoft.DotNet.ProjectModel": "1.0.0-*" - }, - "frameworks": { - "netcoreapp1.0": { - "dependencies": { - "System.Diagnostics.Process": "4.1.0", - "Microsoft.NETCore.App": { - "version": "1.0.0-*", - "type": "platform" - } - } - } - } -} diff --git a/src/Microsoft.AspNetCore.BuildTools.ApiCheck/Microsoft.AspNetCore.BuildTools.ApiCheck.csproj b/src/Microsoft.AspNetCore.BuildTools.ApiCheck/Microsoft.AspNetCore.BuildTools.ApiCheck.csproj new file mode 100644 index 000000000..7f1b76a91 --- /dev/null +++ b/src/Microsoft.AspNetCore.BuildTools.ApiCheck/Microsoft.AspNetCore.BuildTools.ApiCheck.csproj @@ -0,0 +1,26 @@ + + + + 1.0.1 + netcoreapp1.0;net451 + win7-x64 + exe + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.BuildTools.ApiCheck/Microsoft.AspNetCore.BuildTools.ApiCheck.xproj b/src/Microsoft.AspNetCore.BuildTools.ApiCheck/Microsoft.AspNetCore.BuildTools.ApiCheck.xproj deleted file mode 100644 index 354c65844..000000000 --- a/src/Microsoft.AspNetCore.BuildTools.ApiCheck/Microsoft.AspNetCore.BuildTools.ApiCheck.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.25420 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - aefc7985-27c8-468e-8ef8-e1d589c9053f - ApiCheck - .\obj - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/NuGetPackageVerifier.Task/NuGetPackageVerifier.Task.csproj b/src/NuGetPackageVerifier.Task/NuGetPackageVerifier.Task.csproj new file mode 100644 index 000000000..6f4a87ca0 --- /dev/null +++ b/src/NuGetPackageVerifier.Task/NuGetPackageVerifier.Task.csproj @@ -0,0 +1,26 @@ + + + + + + netstandard1.6 + true + NuGetPackageVerifier.Task + + + + + + + PreserveNewest + + + + + + + + + + + diff --git a/src/NuGetPackageVerifier.Task/NuGetPackageVerifier.Task.xproj b/src/NuGetPackageVerifier.Task/NuGetPackageVerifier.Task.xproj deleted file mode 100644 index ecbef610e..000000000 --- a/src/NuGetPackageVerifier.Task/NuGetPackageVerifier.Task.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0.25420 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - ef38c1ca-8a2e-4c8e-b478-7072c0140514 - NuGetPackageVerifier.Task - .\obj - .\bin\ - - - - 2.0 - - - \ No newline at end of file diff --git a/src/NuGetPackageVerifier.Task/project.json b/src/NuGetPackageVerifier.Task/project.json deleted file mode 100644 index 976a21a43..000000000 --- a/src/NuGetPackageVerifier.Task/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "buildOptions": { - "warningsAsErrors": true, - "copyToOutput": "build/**/*.targets" - }, - "dependencies": { - "Microsoft.Build.Framework": "15.1.0-preview-000370-00", - "Microsoft.Build.Tasks.Core": "15.1.0-preview-000370-00", - "Microsoft.Build.Utilities.Core": "15.1.0-preview-000370-00" - }, - "frameworks": { - "netstandard1.6": {} - } -} \ No newline at end of file diff --git a/src/NuGetPackageVerifier/NuGetPackageVerifier.csproj b/src/NuGetPackageVerifier/NuGetPackageVerifier.csproj new file mode 100644 index 000000000..fc388cb3d --- /dev/null +++ b/src/NuGetPackageVerifier/NuGetPackageVerifier.csproj @@ -0,0 +1,35 @@ + + + + + + Verifies Asp.Net Core NuGet packages. + 1.0.2 + netcoreapp1.0 + NuGetPackageVerifier + exe + $(PackageTargetFallback);portable-net45+wp8 + + + + + + + + PreserveNewest + + + + + + + + + + + + + + + + diff --git a/src/NuGetPackageVerifier/NuGetPackageVerifier.xproj b/src/NuGetPackageVerifier/NuGetPackageVerifier.xproj deleted file mode 100644 index c6be566c0..000000000 --- a/src/NuGetPackageVerifier/NuGetPackageVerifier.xproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 657aff5e-164e-493d-8501-8026b7c20808 - NugetPackageVerifier - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - - - 2.0 - - - - - - - - \ No newline at end of file diff --git a/src/NuGetPackageVerifier/project.json b/src/NuGetPackageVerifier/project.json deleted file mode 100644 index 5b0a2151d..000000000 --- a/src/NuGetPackageVerifier/project.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "version": "1.0.2-*", - "description": "Verifies Asp.Net Core NuGet packages.", - "buildOptions": { - "emitEntryPoint": true, - "embed": [ "already-owned-packages.txt" ] - }, - "publishOptions": { - "include": "build/*.targets" - }, - "dependencies": { - "HtmlAgilityPack": "1.4.9", - "Newtonsoft.Json": "9.0.1", - "NuGet.Packaging": "4.0.0-rc-2048", - "Mono.Cecil": "0.10.0-beta1-v2" - }, - "frameworks": { - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0", - "type": "platform" - }, - "System.Runtime.Loader": "4.0.0" - }, - "imports": [ "portable-net45+wp8" ] - } - } -} diff --git a/src/PackageCacheUploader/PackageCacheUploader.csproj b/src/PackageCacheUploader/PackageCacheUploader.csproj new file mode 100644 index 000000000..859365e11 --- /dev/null +++ b/src/PackageCacheUploader/PackageCacheUploader.csproj @@ -0,0 +1,30 @@ + + + + + + Creates a zip package with the expanded version of our nuget packages that can be used as a local cache + 1.0.1 + netcoreapp1.0 + exe + $(PackageTargetFallback);portable-win8+net45 + + + + + + + + + + + + + + + + + + + + diff --git a/src/PackageCacheUploader/project.json b/src/PackageCacheUploader/project.json deleted file mode 100644 index 5079bdf56..000000000 --- a/src/PackageCacheUploader/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "version": "1.0.1-*", - "description": "Creates a zip package with the expanded version of our nuget packages that can be used as a local cache", - "buildOptions": { - "emitEntryPoint": true - }, - "dependencies": { - "Microsoft.Extensions.CommandLineUtils": "1.0.0-*", - "Microsoft.Extensions.Logging": "1.0.0-*", - "Microsoft.Extensions.Logging.Console": "1.0.0-*", - "WindowsAzure.Storage": "7.2.1" - }, - "frameworks": { - "netcoreapp1.0": { - "imports": "portable-win8+net45", - "dependencies": { - "System.Diagnostics.Process": "4.1.0", - "Microsoft.NETCore.App": { - "version": "1.0.0-*", - "type": "platform" - } - } - } - } -} diff --git a/src/PackageClassifier/PackageClassifier.csproj b/src/PackageClassifier/PackageClassifier.csproj new file mode 100644 index 000000000..bf49a7885 --- /dev/null +++ b/src/PackageClassifier/PackageClassifier.csproj @@ -0,0 +1,39 @@ + + + + + + Classifies a set of packages from several directories based on information from a csv file + 1.0.1 + netstandard1.6;net451 + win7-x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/PackageClassifier/PackageClassifier.xproj b/src/PackageClassifier/PackageClassifier.xproj deleted file mode 100644 index 5c3134a7f..000000000 --- a/src/PackageClassifier/PackageClassifier.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 5f13329b-48c4-418a-a495-e9f58949c43e - PackageClassifier - .\obj - .\bin\ - v4.5.2 - - - - 2.0 - - - diff --git a/src/PackageClassifier/Properties/AssemblyInfo.cs b/src/PackageClassifier/Properties/AssemblyInfo.cs deleted file mode 100644 index 36b6301fc..000000000 --- a/src/PackageClassifier/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("PackageClassifier")] -[assembly: AssemblyTrademark("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("5f13329b-48c4-418a-a495-e9f58949c43e")] diff --git a/src/PackageClassifier/project.json b/src/PackageClassifier/project.json deleted file mode 100644 index 109b9dd11..000000000 --- a/src/PackageClassifier/project.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "version": "1.0.1-*", - "description": "Classifies a set of packages from several directories based on information from a csv file", - "authors": [ "Microsoft" ], - "dependencies": { - "Microsoft.Extensions.Logging": "1.0.0-*", - "Microsoft.Extensions.Logging.Console": "1.0.0-*", - "Newtonsoft.Json": "9.0.1", - "NuGet.Client": "3.5.0-*" - }, - "frameworks": { - "netstandard1.6": { - "dependencies": { - "System.Runtime.Serialization.Primitives": "4.1.1-*" - } - }, - "net451": { - "frameworkAssemblies": { - "Microsoft.CSharp": "", - "System.Collections": "", - "System.Xml.Linq": "", - "System.Threading": "", - "System.IO.Compression.FileSystem": "", - "System.Runtime.Serialization.Primitives": "" - } - } - } -} diff --git a/src/SplitPackages/SplitPackages.csproj b/src/SplitPackages/SplitPackages.csproj new file mode 100644 index 000000000..0626a9d5b --- /dev/null +++ b/src/SplitPackages/SplitPackages.csproj @@ -0,0 +1,50 @@ + + + + Copies NuGet packages form a given source folder into a specific set of folders based on a CSV file. + 1.0.1 + netcoreapp1.0;net451 + win7-x64 + portable + exe + + + + + + + + + + + true + + + true + + + true + + + true + + + true + + + true + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/SplitPackages/SplitPackages.xproj b/src/SplitPackages/SplitPackages.xproj deleted file mode 100644 index ac411b364..000000000 --- a/src/SplitPackages/SplitPackages.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.24720 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - c98f7832-85fb-451b-9152-87425acf8eeb - SplitPackages - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/SplitPackages/project.json b/src/SplitPackages/project.json deleted file mode 100644 index 60e3badfa..000000000 --- a/src/SplitPackages/project.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "version": "1.0.1-*", - "description": "Copies Nuget packages form a given source folder into a specific set of folders based on a CSV file.", - "authors": [ "Microsoft" ], - "buildOptions": { - "emitEntryPoint": true, - "debugType": "portable" - }, - "dependencies": { - "PackageClassifier": "1.0.1-*", - "Microsoft.Extensions.CommandLineUtils": "1.0.0-*", - "Microsoft.Extensions.Logging": "1.0.0-*", - "Microsoft.Extensions.Logging.Console": "1.0.0-*", - "Newtonsoft.Json": "9.0.1", - "NuGet.Client": "3.5.0-*" - }, - "frameworks": { - "netcoreapp1.0": { - "dependencies": { - "System.Runtime.Serialization.Primitives": "4.1.1-*", - "Microsoft.NETCore.App": { - "version": "1.0.0-*", - "type": "platform" - } - } - }, - "net451": { - "frameworkAssemblies": { - "Microsoft.CSharp": "", - "System.Collections": "", - "System.Xml.Linq": "", - "System.Threading": "", - "System.IO.Compression.FileSystem": "", - "System.Runtime.Serialization.Primitives": "" - } - } - } -} diff --git a/src/VersionTool/VersionTool.csproj b/src/VersionTool/VersionTool.csproj new file mode 100644 index 000000000..c855b95d3 --- /dev/null +++ b/src/VersionTool/VersionTool.csproj @@ -0,0 +1,22 @@ + + + + + + netcoreapp1.0 + VersionTool + exe + + + + + + + + + + + + + + diff --git a/src/VersionTool/VersionTool.xproj b/src/VersionTool/VersionTool.xproj deleted file mode 100644 index ce7ab71d9..000000000 --- a/src/VersionTool/VersionTool.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 102216c8-55cb-49ea-b20e-d41b1f0e42b1 - VersionTool - .\obj - .\bin\ - v4.5.2 - - - - 2.0 - - - diff --git a/src/VersionTool/project.json b/src/VersionTool/project.json deleted file mode 100644 index 7dd888152..000000000 --- a/src/VersionTool/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true - }, - - "dependencies": { - "Microsoft.Extensions.CommandLineUtils": "1.0.0", - "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - } - }, - - "frameworks": { - "netcoreapp1.0": { - } - } -} diff --git a/test/ApiCheck.Test/ApiCheck.Test.csproj b/test/ApiCheck.Test/ApiCheck.Test.csproj new file mode 100644 index 000000000..af9d7a1b5 --- /dev/null +++ b/test/ApiCheck.Test/ApiCheck.Test.csproj @@ -0,0 +1,29 @@ + + + + netcoreapp1.0;net452 + win7-x64 + exe + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/ApiCheck.Test/ApiCheck.Test.xproj b/test/ApiCheck.Test/ApiCheck.Test.xproj deleted file mode 100644 index 59800d1c2..000000000 --- a/test/ApiCheck.Test/ApiCheck.Test.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - d61a892b-d214-44ab-9652-334c4338377b - ApiCheck.Test - .\obj - .\bin\ - v4.5.2 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/ApiCheck.Test/Properties/AssemblyInfo.cs b/test/ApiCheck.Test/Properties/AssemblyInfo.cs deleted file mode 100644 index 38fb59bbe..000000000 --- a/test/ApiCheck.Test/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ApiCheck.Test")] -[assembly: AssemblyTrademark("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("d61a892b-d214-44ab-9652-334c4338377b")] diff --git a/test/ApiCheck.Test/project.json b/test/ApiCheck.Test/project.json deleted file mode 100644 index 2be60689a..000000000 --- a/test/ApiCheck.Test/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "1.0.0-*", - "dependencies": { - "xunit": "2.2.0-*", - "dotnet-test-xunit": "2.2.0-*", - "Microsoft.AspNetCore.BuildTools.ApiCheck": "1.0.0-*", - "ApiCheckBaseline.V1": "1.0.0-*", - "ApiCheckBaseline.V2": "1.0.0-*" - }, - "testRunner": "xunit", - "frameworks": { - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0", - "type": "platform" - } - } - }, - "net452": {} - } -} diff --git a/test/ApiCheckBaseline.V1/ApiCheckBaseline.V1.csproj b/test/ApiCheckBaseline.V1/ApiCheckBaseline.V1.csproj new file mode 100644 index 000000000..0b64ca32b --- /dev/null +++ b/test/ApiCheckBaseline.V1/ApiCheckBaseline.V1.csproj @@ -0,0 +1,25 @@ + + + + + + netstandard1.6;net452 + win7-x64 + $(PackageTargetFallback);dnxcore50 + + + + + + + + + + + + + + + + + diff --git a/test/ApiCheckBaseline.V1/ApiCheckBaseline.V1.xproj b/test/ApiCheckBaseline.V1/ApiCheckBaseline.V1.xproj deleted file mode 100644 index 9b0b614df..000000000 --- a/test/ApiCheckBaseline.V1/ApiCheckBaseline.V1.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 1b1731e0-4adb-4a04-9418-fcd7f5cfb79e - ApiCheckBaseline.V1 - .\obj - .\bin\ - v4.5.2 - - - - 2.0 - - - diff --git a/test/ApiCheckBaseline.V1/Properties/AssemblyInfo.cs b/test/ApiCheckBaseline.V1/Properties/AssemblyInfo.cs deleted file mode 100644 index 7880d1a86..000000000 --- a/test/ApiCheckBaseline.V1/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ApiCheckApiListing.V1")] -[assembly: AssemblyTrademark("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("1b1731e0-4adb-4a04-9418-fcd7f5cfb79e")] diff --git a/test/ApiCheckBaseline.V1/project.json b/test/ApiCheckBaseline.V1/project.json deleted file mode 100644 index 27b9cc71e..000000000 --- a/test/ApiCheckBaseline.V1/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": "1.0.0-*", - "dependencies": { - "NETStandard.Library": { - "version": "1.6.0" - } - }, - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - }, - "net452": {} - } -} diff --git a/test/ApiCheckBaseline.V2/ApiCheckBaseline.V2.csproj b/test/ApiCheckBaseline.V2/ApiCheckBaseline.V2.csproj new file mode 100644 index 000000000..451d04099 --- /dev/null +++ b/test/ApiCheckBaseline.V2/ApiCheckBaseline.V2.csproj @@ -0,0 +1,25 @@ + + + + + + netstandard1.6;net452 + win7-x64 + $(PackageTargetFallback);dnxcore50 + + + + + + + + + + + + + + + + + diff --git a/test/ApiCheckBaseline.V2/ApiCheckBaseline.V2.xproj b/test/ApiCheckBaseline.V2/ApiCheckBaseline.V2.xproj deleted file mode 100644 index e37a3a519..000000000 --- a/test/ApiCheckBaseline.V2/ApiCheckBaseline.V2.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - eca89839-3332-43f3-b1b1-9c2d91b7285e - ApiCheckBaseline.V2 - .\obj - .\bin\ - v4.5.2 - - - - 2.0 - - - diff --git a/test/ApiCheckBaseline.V2/Properties/AssemblyInfo.cs b/test/ApiCheckBaseline.V2/Properties/AssemblyInfo.cs deleted file mode 100644 index d6a2df6e2..000000000 --- a/test/ApiCheckBaseline.V2/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("ApiCheckApiListing.V2")] -[assembly: AssemblyTrademark("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("eca89839-3332-43f3-b1b1-9c2d91b7285e")] diff --git a/test/ApiCheckBaseline.V2/project.json b/test/ApiCheckBaseline.V2/project.json deleted file mode 100644 index 27b9cc71e..000000000 --- a/test/ApiCheckBaseline.V2/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": "1.0.0-*", - "dependencies": { - "NETStandard.Library": { - "version": "1.6.0" - } - }, - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - }, - "net452": {} - } -} diff --git a/version.props b/version.props new file mode 100644 index 000000000..98d91fb89 --- /dev/null +++ b/version.props @@ -0,0 +1,6 @@ + + + + rc2 + + \ No newline at end of file