diff --git a/BuildTools.sln b/BuildTools.sln index a2c28698a..dec35428e 100644 --- a/BuildTools.sln +++ b/BuildTools.sln @@ -1,7 +1,6 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26009.0 +VisualStudioVersion = 15.0.26116.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A4F4353B-C3D2-40B0-909A-5B48A748EA76}" EndProject @@ -34,6 +33,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGetPackageVerifier.Task", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PackageCacheUploader", "src\PackageCacheUploader\PackageCacheUploader.csproj", "{EBC0BF3F-14B4-4595-980D-D4D738043D59}" EndProject +Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Internal.AspNetCore.Sdk", "src\Internal.AspNetCore.Sdk\Internal.AspNetCore.Sdk.csproj", "{F0E4CF2B-29B9-432B-BF27-195996CA24FD}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -176,6 +177,18 @@ Global {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 + {F0E4CF2B-29B9-432B-BF27-195996CA24FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F0E4CF2B-29B9-432B-BF27-195996CA24FD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F0E4CF2B-29B9-432B-BF27-195996CA24FD}.Debug|x64.ActiveCfg = Debug|x64 + {F0E4CF2B-29B9-432B-BF27-195996CA24FD}.Debug|x64.Build.0 = Debug|x64 + {F0E4CF2B-29B9-432B-BF27-195996CA24FD}.Debug|x86.ActiveCfg = Debug|x86 + {F0E4CF2B-29B9-432B-BF27-195996CA24FD}.Debug|x86.Build.0 = Debug|x86 + {F0E4CF2B-29B9-432B-BF27-195996CA24FD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F0E4CF2B-29B9-432B-BF27-195996CA24FD}.Release|Any CPU.Build.0 = Release|Any CPU + {F0E4CF2B-29B9-432B-BF27-195996CA24FD}.Release|x64.ActiveCfg = Release|x64 + {F0E4CF2B-29B9-432B-BF27-195996CA24FD}.Release|x64.Build.0 = Release|x64 + {F0E4CF2B-29B9-432B-BF27-195996CA24FD}.Release|x86.ActiveCfg = Release|x86 + {F0E4CF2B-29B9-432B-BF27-195996CA24FD}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -192,5 +205,6 @@ Global {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} + {F0E4CF2B-29B9-432B-BF27-195996CA24FD} = {A4F4353B-C3D2-40B0-909A-5B48A748EA76} EndGlobalSection EndGlobal diff --git a/build.ps1 b/build.ps1 index f780c43a8..071bb5daa 100644 --- a/build.ps1 +++ b/build.ps1 @@ -33,7 +33,7 @@ cd $PSScriptRoot $repoFolder = $PSScriptRoot $env:REPO_FOLDER = $repoFolder -$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild.zip" +$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild-rc3.zip" if ($env:KOREBUILD_ZIP) { $koreBuildZip=$env:KOREBUILD_ZIP diff --git a/build.sh b/build.sh index ff7978919..af9336adc 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/feature/msbuild.zip" +koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild-rc3.zip" if [ ! -z $KOREBUILD_ZIP ]; then koreBuildZip=$KOREBUILD_ZIP fi diff --git a/build/common.props b/build/common.props index ee2a70d07..f14ba8cf1 100644 --- a/build/common.props +++ b/build/common.props @@ -6,12 +6,30 @@ <_AspNetToolsSdkPath>$([MSBuild]::GetDirectoryNameOfFileAbove($(MsBuildThisFileDirectory), NuGet.config))\src\Internal.AspNetCore.Sdk $(_AspNetToolsSdkPath)\build\Internal.AspNetCore.Sdk.props $(_AspNetToolsSdkPath)\build\Internal.AspNetCore.Sdk.targets - $(_AspNetToolsSdkPath)\buildCrossTargeting\Internal.AspNetCore.Sdk.targets + $(_AspNetToolsSdkPath)\buildMultiTargeting\Internal.AspNetCore.Sdk.targets https://github.com/aspnet/BuildTools git + true + + + + + <_SecondBasedTimeStamp>$([System.DateTime]::UtcNow.Subtract($([System.DateTime]::FromBinary(635556672000000000))).TotalSeconds.ToString("F0")) + <_SecondBasedTimeStamp>t$([System.Int64]::Parse($(_SecondBasedTimeStamp)).ToString("x9")) + + + $(_SecondBasedTimeStamp) + $(VersionSuffix)-$(BuildNumber) + $(BuildNumber) + + + \ No newline at end of file diff --git a/global.json b/global.json deleted file mode 100644 index 4b03addc8..000000000 --- a/global.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "sdk": { - "version": "1.0.0-preview4-004233" - } -} \ No newline at end of file diff --git a/makefile.shade b/makefile.shade index 13758fd06..e5d24fa88 100644 --- a/makefile.shade +++ b/makefile.shade @@ -13,15 +13,6 @@ k-standard-goals #xml-docs-test .clean .build-compile description='Check generated XML documentation files for errors' target='test' k-xml-docs-test -#pack-sdk target='package' - @{ - var buildNumber = E("BuildNumber") ?? BuildNumber; - NugetPack(E("KOREBUILD_NUGET_EXE") ?? ".build/NuGet.exe", - "src/Internal.AspNetCore.Sdk/Internal.AspNetCore.Sdk.nuspec", - BUILD_DIR, - "-Verbosity Detailed -Properties versionsuffix=alpha-" + buildNumber); - } - #pack-nuspecs target='package' @{ var configuration = E("Configuration"); diff --git a/src/DependenciesPackager/DependenciesPackager.csproj b/src/DependenciesPackager/DependenciesPackager.csproj index b758a47e4..948487d41 100644 --- a/src/DependenciesPackager/DependenciesPackager.csproj +++ b/src/DependenciesPackager/DependenciesPackager.csproj @@ -9,11 +9,6 @@ exe - - - - - diff --git a/src/Internal.AspNetCore.Sdk/Internal.AspNetCore.Sdk.csproj b/src/Internal.AspNetCore.Sdk/Internal.AspNetCore.Sdk.csproj new file mode 100644 index 000000000..04fb9b5de --- /dev/null +++ b/src/Internal.AspNetCore.Sdk/Internal.AspNetCore.Sdk.csproj @@ -0,0 +1,18 @@ + + + + + + 1.0.1 + netstandard1.0 + false + false + Build targets and extensions to Microsoft.NET.Sdk. This package is intended for Microsoft use only. + + + + + + + + \ No newline at end of file diff --git a/src/Internal.AspNetCore.Sdk/Internal.AspNetCore.Sdk.nuspec b/src/Internal.AspNetCore.Sdk/Internal.AspNetCore.Sdk.nuspec deleted file mode 100644 index fd350d3b5..000000000 --- a/src/Internal.AspNetCore.Sdk/Internal.AspNetCore.Sdk.nuspec +++ /dev/null @@ -1,13 +0,0 @@ - - - - Internal.AspNetCore.Sdk - 1.0.0-$versionsuffix$ - Microsoft - Build targets and customizations to Microsoft.NET.Sdk - - - - - - \ No newline at end of file diff --git a/src/Internal.AspNetCore.Sdk/build/AssemblyInfo.Serviceable.cs b/src/Internal.AspNetCore.Sdk/build/AssemblyInfo.Serviceable.cs deleted file mode 100644 index 071529342..000000000 --- a/src/Internal.AspNetCore.Sdk/build/AssemblyInfo.Serviceable.cs +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -[assembly: System.Reflection.AssemblyMetadata("Serviceable", "True")] diff --git a/src/Internal.AspNetCore.Sdk/build/GenerateAssemblyInfo.targets b/src/Internal.AspNetCore.Sdk/build/GenerateAssemblyInfo.targets new file mode 100644 index 000000000..37260493b --- /dev/null +++ b/src/Internal.AspNetCore.Sdk/build/GenerateAssemblyInfo.targets @@ -0,0 +1,44 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + $(IntermediateOutputPath)Internal.AspNetCore.Sdk.AssemblyInfo$(DefaultLanguageSourceExtension) + true + + + + + + + + + <_InternalAspNetCoreAttributes Remove="@(_InternalAspNetCoreAttributes)" /> + <_InternalAspNetCoreAttributes Include="System.Reflection.AssemblyMetadata" Condition="'$(Serviceable)'!='false'"> + <_Parameter1>Serviceable + <_Parameter2>true + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Internal.AspNetCore.Sdk/build/Internal.AspNetCore.Sdk.targets b/src/Internal.AspNetCore.Sdk/build/Internal.AspNetCore.Sdk.targets index 6e315ef92..52bbb2353 100644 --- a/src/Internal.AspNetCore.Sdk/build/Internal.AspNetCore.Sdk.targets +++ b/src/Internal.AspNetCore.Sdk/build/Internal.AspNetCore.Sdk.targets @@ -3,8 +3,6 @@ WARNING: These targets are intended for building Microsoft's ASP.NET Core repos, for use outside of Microsoft. --> - - - + \ No newline at end of file diff --git a/src/Internal.AspNetCore.Sdk/build/Workarounds.targets b/src/Internal.AspNetCore.Sdk/build/Workarounds.targets deleted file mode 100644 index 2c6def267..000000000 --- a/src/Internal.AspNetCore.Sdk/build/Workarounds.targets +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - - exe - - - - - - - - - <_P2PVersion>$(Version) - <_P2PVersion Condition="'$(PackageVersion)'!=''">$(PackageVersion) - - - - <_ProjectReferences Update="@(_ProjectReferences)" Condition="'%(PackageVersion)'==''"> - $(_P2PVersion) - - - <_FloatingVersions Include="@(_PackageReferences)" Condition="$([System.String]::new('%(Version)').EndsWith('*'))" /> - <_ResolvedFloatingVersion Include="@(_FloatingVersions)"> - %(_DependenciesDesignTime.Name) - %(_DependenciesDesignTime.Version) - - <_PackageReferences Remove="@(_PackageReferences)" Condition="$([System.String]::new('%(Version)').EndsWith('*'))" /> - <_PackageReferences Include="@(_ResolvedFloatingVersion)" Condition="'%(Identity)'=='%(_ResolvedFloatingVersion.ResolvedName)'" /> - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Internal.AspNetCore.Sdk/buildCrossTargeting/Internal.AspNetCore.Sdk.targets b/src/Internal.AspNetCore.Sdk/buildCrossTargeting/Internal.AspNetCore.Sdk.targets deleted file mode 100644 index 2a81b7430..000000000 --- a/src/Internal.AspNetCore.Sdk/buildCrossTargeting/Internal.AspNetCore.Sdk.targets +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/Internal.AspNetCore.Sdk/buildCrossTargeting/Workarounds.targets b/src/Internal.AspNetCore.Sdk/buildCrossTargeting/Workarounds.targets deleted file mode 100644 index 1ebcf8ec8..000000000 --- a/src/Internal.AspNetCore.Sdk/buildCrossTargeting/Workarounds.targets +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - <_TargetFramework Include="$(TargetFrameworks)" /> - - - - - - - - <_P2PVersion>$(Version) - <_P2PVersion Condition="'$(PackageVersion)'!=''">$(PackageVersion) - - - - <_ProjectReferences Update="@(_ProjectReferences)" Condition="'%(PackageVersion)'==''"> - $(_P2PVersion) - - - <_FloatingVersions Include="@(_PackageReferences)" Condition="$([System.String]::new('%(Version)').EndsWith('*'))" /> - <_ResolvedFloatingVersion Include="@(_FloatingVersions)"> - %(_DependenciesDesignTime.Name) - %(_DependenciesDesignTime.Version) - - <_PackageReferences Remove="@(_PackageReferences)" Condition="$([System.String]::new('%(Version)').EndsWith('*'))" /> - <_PackageReferences Include="@(_ResolvedFloatingVersion)" Condition="'%(Identity)'=='%(_ResolvedFloatingVersion.ResolvedName)'" /> - - - - - - - \ No newline at end of file diff --git a/src/Internal.AspNetCore.Sdk/buildCrossTargeting/Internal.AspNetCore.Sdk.props b/src/Internal.AspNetCore.Sdk/buildMultiTargeting/Internal.AspNetCore.Sdk.props similarity index 100% rename from src/Internal.AspNetCore.Sdk/buildCrossTargeting/Internal.AspNetCore.Sdk.props rename to src/Internal.AspNetCore.Sdk/buildMultiTargeting/Internal.AspNetCore.Sdk.props diff --git a/src/Internal.AspNetCore.Sdk/buildMultiTargeting/Internal.AspNetCore.Sdk.targets b/src/Internal.AspNetCore.Sdk/buildMultiTargeting/Internal.AspNetCore.Sdk.targets new file mode 100644 index 000000000..26954a425 --- /dev/null +++ b/src/Internal.AspNetCore.Sdk/buildMultiTargeting/Internal.AspNetCore.Sdk.targets @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/src/Internal.AspNetCore.Sdk/targets/BuildNumber.targets b/src/Internal.AspNetCore.Sdk/targets/BuildNumber.targets index 590e67036..5d5a8a8fc 100644 --- a/src/Internal.AspNetCore.Sdk/targets/BuildNumber.targets +++ b/src/Internal.AspNetCore.Sdk/targets/BuildNumber.targets @@ -10,23 +10,7 @@ For single-tfm projects, this will be imported from build/Internal.AspNetCore.Sd --> - - - <_SecondBasedTimeStamp>$([System.DateTime]::UtcNow.Subtract($([System.DateTime]::FromBinary(635556672000000000))).TotalSeconds.ToString("F0")) - <_SecondBasedTimeStamp>t$([System.Int64]::Parse($(_SecondBasedTimeStamp)).ToString("x9")) - - - - $(KOREBUILD_BUILD_NUMBER) - - - $(_SecondBasedTimeStamp) - $(VersionSuffix)-$(BuildNumber) - $(BuildNumber) - + diff --git a/src/Microsoft.AspNetCore.BuildTools.ApiCheck/Microsoft.AspNetCore.BuildTools.ApiCheck.csproj b/src/Microsoft.AspNetCore.BuildTools.ApiCheck/Microsoft.AspNetCore.BuildTools.ApiCheck.csproj index 142b12acb..0de1b29e8 100644 --- a/src/Microsoft.AspNetCore.BuildTools.ApiCheck/Microsoft.AspNetCore.BuildTools.ApiCheck.csproj +++ b/src/Microsoft.AspNetCore.BuildTools.ApiCheck/Microsoft.AspNetCore.BuildTools.ApiCheck.csproj @@ -10,11 +10,6 @@ exe - - - - - diff --git a/src/NuGetPackageVerifier.Task/NuGetPackageVerifier.Task.csproj b/src/NuGetPackageVerifier.Task/NuGetPackageVerifier.Task.csproj index c814652b2..1ad1272ba 100644 --- a/src/NuGetPackageVerifier.Task/NuGetPackageVerifier.Task.csproj +++ b/src/NuGetPackageVerifier.Task/NuGetPackageVerifier.Task.csproj @@ -9,8 +9,6 @@ - - PreserveNewest diff --git a/src/NuGetPackageVerifier/NuGetPackageVerifier.csproj b/src/NuGetPackageVerifier/NuGetPackageVerifier.csproj index 6570f5c96..fdf7d788f 100644 --- a/src/NuGetPackageVerifier/NuGetPackageVerifier.csproj +++ b/src/NuGetPackageVerifier/NuGetPackageVerifier.csproj @@ -12,8 +12,6 @@ - - PreserveNewest diff --git a/src/PackageCacheUploader/PackageCacheUploader.csproj b/src/PackageCacheUploader/PackageCacheUploader.csproj index 8bf4b7be4..b51b547c2 100644 --- a/src/PackageCacheUploader/PackageCacheUploader.csproj +++ b/src/PackageCacheUploader/PackageCacheUploader.csproj @@ -10,11 +10,6 @@ $(PackageTargetFallback);portable-win8+net45 - - - - - diff --git a/src/PackageClassifier/PackageClassifier.csproj b/src/PackageClassifier/PackageClassifier.csproj index 166bcbbdb..0b5abea91 100644 --- a/src/PackageClassifier/PackageClassifier.csproj +++ b/src/PackageClassifier/PackageClassifier.csproj @@ -9,11 +9,6 @@ library - - - - - diff --git a/src/SplitPackages/SplitPackages.csproj b/src/SplitPackages/SplitPackages.csproj index 85c85edc8..baaca4125 100644 --- a/src/SplitPackages/SplitPackages.csproj +++ b/src/SplitPackages/SplitPackages.csproj @@ -8,34 +8,9 @@ portable exe - - - - - - - true - - - true - - - true - - - true - - - true - - - true - - - diff --git a/src/VersionTool/VersionTool.csproj b/src/VersionTool/VersionTool.csproj index 9bb67e4d4..5548c75c2 100644 --- a/src/VersionTool/VersionTool.csproj +++ b/src/VersionTool/VersionTool.csproj @@ -8,11 +8,6 @@ exe - - - - - diff --git a/test/ApiCheck.Test/ApiCheck.Test.csproj b/test/ApiCheck.Test/ApiCheck.Test.csproj index c72865bb8..7e5d3f03b 100644 --- a/test/ApiCheck.Test/ApiCheck.Test.csproj +++ b/test/ApiCheck.Test/ApiCheck.Test.csproj @@ -7,11 +7,6 @@ win7-x64 - - - - - @@ -19,7 +14,7 @@ - + diff --git a/test/ApiCheckBaseline.V1/ApiCheckBaseline.V1.csproj b/test/ApiCheckBaseline.V1/ApiCheckBaseline.V1.csproj index ee2bb42ea..b8a6c5443 100644 --- a/test/ApiCheckBaseline.V1/ApiCheckBaseline.V1.csproj +++ b/test/ApiCheckBaseline.V1/ApiCheckBaseline.V1.csproj @@ -6,11 +6,6 @@ netstandard1.6;net452 - - - - - diff --git a/test/ApiCheckBaseline.V2/ApiCheckBaseline.V2.csproj b/test/ApiCheckBaseline.V2/ApiCheckBaseline.V2.csproj index ee2bb42ea..b8a6c5443 100644 --- a/test/ApiCheckBaseline.V2/ApiCheckBaseline.V2.csproj +++ b/test/ApiCheckBaseline.V2/ApiCheckBaseline.V2.csproj @@ -6,11 +6,6 @@ netstandard1.6;net452 - - - - -