diff options
23 files changed, 714 insertions, 169 deletions
diff --git a/.gitignore b/.gitignore index 8b34a47451..65937db30f 100644 --- a/.gitignore +++ b/.gitignore @@ -144,6 +144,7 @@ publish/ # NuGet Packages *.nupkg **/packages/* +project.lock.json # Windows Azure Build Output csx/ @@ -449,6 +449,31 @@ if errorlevel 1 ( exit /b 1 ) +:GenerateNuget +if /i "%__BuildArch%" =="arm64" goto :SkipNuget + +set "__BuildLog=%__LogsDir%\Nuget_%__BuildOS%__%__BuildArch%__%__BuildType%.log" +set "__BuildWrn=%__LogsDir%\Nuget_%__BuildOS%__%__BuildArch%__%__BuildType%.wrn" +set "__BuildErr=%__LogsDir%\Nuget_%__BuildOS%__%__BuildArch%__%__BuildType%.err" +set __msbuildLogArgs=^ +/fileloggerparameters:Verbosity=normal;LogFile="%__BuildLog%" ^ +/fileloggerparameters1:WarningsOnly;LogFile="%__BuildWrn%" ^ +/fileloggerparameters2:ErrorsOnly;LogFile="%__BuildErr%" ^ +/consoleloggerparameters:Summary ^ +/verbosity:minimal + +set __msbuildArgs="%__ProjectFilesDir%\src\.nuget\Microsoft.NETCore.Runtime.CoreClr\Microsoft.NETCore.Runtime.CoreCLR.builds" /p:Platform=%__BuildArch% +%_msbuildexe% %__msbuildArgs% %__msbuildLogArgs% +if errorlevel 1 ( + echo %__MsgPrefix%Error: Nuget package generation failed build failed. Refer to the build log files for details: + echo %__BuildLog% + echo %__BuildWrn% + echo %__BuildErr% + exit /b 1 +) + +:SkipNuget + :SkipCrossGenBuild REM endlocal to rid us of environment changes from vsdevenv.bat diff --git a/build.proj b/build.proj index 95b7a6ec68..7202143088 100644 --- a/build.proj +++ b/build.proj @@ -15,4 +15,9 @@ <Target Name="Clean"> <Delete Files="$(BinDir)mscorlib.*" /> </Target> + + <Target Name="RestoreNETCorePlatforms" AfterTargets="Build"> + <Exec Command="$(DnuRestoreCommand) $(SourceDir).nuget/init/project.json --source https://www.myget.org/F/dotnet-core/" /> + </Target> + </Project>
\ No newline at end of file @@ -23,6 +23,24 @@ usage() exit 1 } +initDistroName() +{ + if [ "$__BuildOS" == "Linux" ]; then + # Detect Distro + if [ "$(cat /etc/*-release | grep -cim1 ubuntu)" -eq 1 ]; then + export __DistroName=ubuntu + elif [ "$(cat /etc/*-release | grep -cim1 centos)" -eq 1 ]; then + export __DistroName=rhel + elif [ "$(cat /etc/*-release | grep -cim1 rhel)" -eq 1 ]; then + export __DistroName=rhel + elif [ "$(cat /etc/*-release | grep -cim1 debian)" -eq 1 ]; then + export __DistroName=debian + else + export __DistroName="" + fi + fi +} + setup_dirs() { echo Setting up directories for build @@ -162,50 +180,49 @@ build_coreclr() fi } -build_mscorlib() +restoreBuildTools() { - hash mono 2> /dev/null || { echo >&2 "Skipping mscorlib.dll build since Mono is not installed."; return; } - - if [ $__SkipMSCorLib == 1 ]; then - echo "Skipping mscorlib.dll build." - return + echo "Restoring BuildTools..." + $__ProjectRoot/init-tools.sh + if [ $? -ne 0 ]; then + echo "Failed to restore BuildTools." + exit 1 fi +} - # Temporary hack to make dnu restore more reliable. This is specifically for dnu beta 5 since this issue should already be addressed in later versions of dnu. - export MONO_THREADS_PER_CPU=2000 +isMSBuildOnNETCoreSupported() +{ + __isMSBuildOnNETCoreSupported=0 - echo "Commencing build of mscorlib components for $__BuildOS.$__BuildArch.$__BuildType" + if [ "$__BuildOS" == "Linux" ]; then + if [ "$__DistroName" == "ubuntu" ]; then + __isMSBuildOnNETCoreSupported=1 + fi + elif [ "$__BuildOS" == "OSX" ]; then + __isMSBuildOnNETCoreSupported=1 + fi +} - # Pull NuGet.exe down if we don't have it already - if [ ! -e "$__NuGetPath" ]; then - hash curl 2>/dev/null || hash wget 2>/dev/null || { echo >&2 echo "cURL or wget is required to build mscorlib." ; exit 1; } +build_mscorlib() +{ - echo "Restoring NuGet.exe..." + if [ $__isMSBuildOnNETCoreSupported == 0 ]; then + echo "Mscorlib.dll build unsupported." + return + fi - # curl has HTTPS CA trust-issues less often than wget, so lets try that first. - which curl > /dev/null 2> /dev/null - if [ $? -ne 0 ]; then - mkdir -p $__PackagesDir - wget -q -O $__NuGetPath https://api.nuget.org/downloads/nuget.exe - else - curl -sSL --create-dirs -o $__NuGetPath https://api.nuget.org/downloads/nuget.exe - fi + # CI_TODO: Until we switch CI to stop building mscorlib for platforms supported by isMSBuildOnNETCoreSupported function, + # we should ignore skipping building mscorlib. + # if [ $__SkipMSCorLib == 1 ]; then + # echo "Skipping building mscorlib." + # return + # fi - if [ $? -ne 0 ]; then - echo "Failed to restore NuGet.exe." - exit 1 - fi - fi + # Restore buildTools - # Grab the MSBuild package if we don't have it already - if [ ! -e "$__MSBuildPath" ]; then - echo "Restoring MSBuild..." - $__ProjectRoot/init-tools.sh - if [ $? -ne 0 ]; then - echo "Failed to restore MSBuild." - exit 1 - fi - fi + restoreBuildTools + + echo "Commencing build of mscorlib components for $__BuildOS.$__BuildArch.$__BuildType" # Invoke MSBuild $__ProjectRoot/Tools/corerun "$__MSBuildPath" /nologo "$__ProjectRoot/build.proj" /verbosity:minimal "/fileloggerparameters:Verbosity=normal;LogFile=$__LogsDir/MSCorLib_$__BuildOS__$__BuildArch__$__BuildType.log" /t:Build /p:__BuildOS=$__BuildOS /p:__BuildArch=$__BuildArch /p:__BuildType=$__BuildType /p:__IntermediatesDir=$__IntermediatesDir /p:UseRoslynCompiler=true /p:BuildNugetPackage=false /p:UseSharedCompilation=false @@ -225,6 +242,38 @@ build_mscorlib() fi } +generate_NugetPackages() +{ + # We can only generate nuget package if we also support building mscorlib as part of this build. + if [ $__isMSBuildOnNETCoreSupported == 0 ]; then + echo "Microsoft.NETCore.Runtime.CoreCLR nuget package generation unsupported." + return + fi + + # Since we can build mscorlib for this OS, did we build the native components as well? + if [ $__SkipCoreCLR == 1 ]; then + echo "Unable to generate Microsoft.NETCore.Runtime.CoreCLR nuget package since native components were not built." + return + fi + + # CI_TODO: Until we switch CI to stop building mscorlib for platforms supported by isMSBuildOnNETCoreSupported function, + # we should ignore skipping building mscorlib. + # if [ $__SkipMSCorLib == 1 ]; then + # echo "Unable to generate Microsoft.NETCore.Runtime.CoreCLR nuget package since mscorlib was not built." + # return + # fi + + echo "Generating nuget packages for "$__BuildOS + + # Invoke MSBuild + $__ProjectRoot/Tools/corerun "$__MSBuildPath" /nologo "$__ProjectRoot/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds" /verbosity:minimal "/fileloggerparameters:Verbosity=normal;LogFile=$__LogsDir/Nuget_$__BuildOS__$__BuildArch__$__BuildType.log" /t:Build /p:__BuildOS=$__BuildOS /p:__BuildArch=$__BuildArch /p:__BuildType=$__BuildType /p:__IntermediatesDir=$__IntermediatesDir /p:UseRoslynCompiler=true /p:BuildNugetPackage=false /p:UseSharedCompilation=false + + if [ $? -ne 0 ]; then + echo "Failed to generate Nuget packages." + exit 1 + fi +} + echo "Commencing CoreCLR Repo build" # Argument types supported by this script: @@ -240,7 +289,7 @@ __ProjectRoot="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # Use uname to determine what the CPU is. CPUName=$(uname -p) # Some Linux platforms report unknown for platform, but the arch for machine. -if [ $CPUName = "unknown" ]; then +if [ $CPUName == "unknown" ]; then CPUName=$(uname -m) fi @@ -327,6 +376,7 @@ __ClangMajorVersion=3 __ClangMinorVersion=5 __MSBuildPath=$__ProjectRoot/Tools/MSBuild.exe __NuGetPath="$__PackagesDir/NuGet.exe" +__DistroName="" for i in "$@" do @@ -443,6 +493,9 @@ if [[ $__ConfigureOnly == 1 && $__SkipConfigure == 1 ]]; then exit 1 fi +# init the distro name +initDistroName + # Set the remaining variables based upon the determined build configuration __BinDir="$__RootBinDir/Product/$__BuildOS.$__BuildArch.$__BuildType" __PackagesBinDir="$__BinDir/.nuget" @@ -450,6 +503,20 @@ __ToolsDir="$__RootBinDir/tools" __TestWorkingDir="$__RootBinDir/tests/$__BuildOS.$__BuildArch.$__BuildType" export __IntermediatesDir="$__RootBinDir/obj/$__BuildOS.$__BuildArch.$__BuildType" __TestIntermediatesDir="$__RootBinDir/tests/obj/$__BuildOS.$__BuildArch.$__BuildType" +__isMSBuildOnNETCoreSupported=0 + +# Init if MSBuild for .NET Core is supported for this platform +isMSBuildOnNETCoreSupported + +# CI_SPECIFIC - On CI machines, $HOME may not be set. In such a case, create a subfolder and set the variable to set. +# This is needed by CLI to function. +if [ -z "$HOME" ]; then + if [ ! -d "$__ProjectDir/temp_home" ]; then + mkdir temp_home + fi + export HOME=$__ProjectDir/temp_home + echo "HOME not defined; setting it to $HOME" +fi # Specify path to be set for CMAKE_INSTALL_PREFIX. # This is where all built CoreClr libraries will copied to. @@ -489,6 +556,11 @@ build_coreclr build_mscorlib +# Generate nuget packages + +generate_NugetPackages + + # Build complete echo "Repo successfully built." @@ -59,7 +59,7 @@ fails to write packages to it if the path contains the forward slash. --> <PackagesBinDir>$(__PackagesBinDir)</PackagesBinDir> - <PackagesBinDir Condition="'$(__PackagesBinDir)'==''">$(BinDir).nuget</PackagesBinDir> + <PackagesBinDir Condition="'$(__PackagesBinDir)'==''">$(BinDir).nuget\</PackagesBinDir> <ToolsDir Condition="'$(ToolsDir)'==''">$(ProjectDir)Tools/</ToolsDir> <DotnetCliPath Condition="'$(DotnetCliPath)'==''">$(ToolsDir)dotnetcli/bin/</DotnetCliPath> @@ -103,17 +103,11 @@ <!-- Setup Nuget properties --> <ItemGroup> - <NuSpecSrcs Include="$(SourceDir)\.nuget\Microsoft.DotNet.CoreCLR.nuspec" /> <NuSpecSrcs Include="$(SourceDir)\.nuget\toolchain.win7-x64.Microsoft.DotNet.RyuJit.nuspec" /> - <NuSpecSrcs Condition="'$(Configuration)'=='Release'" Include="$(SourceDir)\.nuget\Microsoft.DotNet.CoreCLR.Development.nuspec" /> - <NuSpecSrcs Condition="'$(Configuration)'=='Debug'" Include="$(SourceDir)\.nuget\Microsoft.DotNet.CoreCLR.Debug.Development.nuspec" /> </ItemGroup> <ItemGroup> <!-- Backslash appended, see note in dir.props about the PackagesBinDir property --> - <NuSpecs Include="$(PackagesBinDir)\Microsoft.DotNet.CoreCLR.nuspec" /> <NuSpecs Include="$(PackagesBinDir)\toolchain.win7-x64.Microsoft.DotNet.RyuJit.nuspec" /> - <NuSpecs Condition="'$(Configuration)'=='Release'" Include="$(PackagesBinDir)\Microsoft.DotNet.CoreCLR.Development.nuspec" /> - <NuSpecs Condition="'$(Configuration)'=='Debug'" Include="$(PackagesBinDir)\Microsoft.DotNet.CoreCLR.Debug.Development.nuspec" /> </ItemGroup> <!-- @@ -132,5 +126,31 @@ <TargetsWindows Condition="'$(BuildOS)' == 'Windows_NT'">true</TargetsWindows> <TargetsUnix Condition="'$(TargetsFreeBSD)' == 'true' or '$(TargetsLinux)' == 'true' or '$(TargetsOSX)' == 'true'">true</TargetsUnix> + + <!-- We are only tracking Linux Distributions for Nuget RID mapping --> + <DistroName Condition="'$(TargetsLinux)' == 'true'">$(__DistroName)</DistroName> + </PropertyGroup> + + <!-- Packaging properties --> + <PropertyGroup> + <PreReleaseLabel>rc3</PreReleaseLabel> + <PackageDescriptionFile>$(SourceDir).nuget/descriptions.json</PackageDescriptionFile> + <PackageLicenseFile>$(SourceDir).nuget/dotnet_library_license.txt</PackageLicenseFile> + <PackageThirdPartyNoticesFile>$(SourceDir).nuget/ThirdPartyNotices.txt</PackageThirdPartyNoticesFile> + + <!-- This should be kept in sync with package details in src/.nuget/init/project.json --> + <RuntimeIdGraphDefinitionFile>$(PackagesDir)/Microsoft.NETCore.Platforms/1.0.1-rc2-23712/runtime.json</RuntimeIdGraphDefinitionFile> + + <!-- On Windows, MSbuild still runs against Desktop FX while it runs on .NET Core on non-Windows. this requires + pulling in different packaging dependencies. + --> + <PackagingTaskDir Condition="'$(TargetsWindows)' == 'true'">$(ToolsDir)net45/</PackagingTaskDir> + <BuildNumberMajor Condition="'$(BuildNumberMajor)' == ''">00001</BuildNumberMajor> + <!-- defined in buildtools packaging.targets, but we need this before targets are imported --> + <PackagePlatform Condition="'$(PackagePlatform)' == ''">$(BuildArch)</PackagePlatform> + <PackagePlatform Condition="'$(PackagePlatform)' == 'amd64'">x64</PackagePlatform> + <PackageOutputPath>$(PackagesBinDir)/pkg/</PackageOutputPath> + </PropertyGroup> + </Project> diff --git a/init-tools.sh b/init-tools.sh index 9b82472d09..97a8f10a19 100755 --- a/init-tools.sh +++ b/init-tools.sh @@ -1,6 +1,35 @@ #!/usr/bin/env bash +initDistroName() +{ + if [ "$1" == "Linux" ]; then + # Detect Distro + if [ "$(cat /etc/*-release | grep -cim1 ubuntu)" -eq 1 ]; then + export __DistroName=ubuntu + elif [ "$(cat /etc/*-release | grep -cim1 centos)" -eq 1 ]; then + export __DistroName=centos + elif [ "$(cat /etc/*-release | grep -cim1 rhel)" -eq 1 ]; then + export __DistroName=rhel + elif [ "$(cat /etc/*-release | grep -cim1 debian)" -eq 1 ]; then + export __DistroName=debian + else + export __DistroName="" + fi + fi +} + __scriptpath=$(cd "$(dirname "$0")"; pwd -P) + +# CI_SPECIFIC - On CI machines, $HOME may not be set. In such a case, create a subfolder and set the variable to set. +# This is needed by CLI to function. +if [ -z "$HOME" ]; then + if [ ! -d "$__scriptpath/temp_home" ]; then + mkdir temp_home + fi + export HOME=$__scriptpath/temp_home + echo "HOME not defined; setting it to $HOME" +fi + __PACKAGES_DIR=$__scriptpath/packages __TOOLRUNTIME_DIR=$__scriptpath/Tools __DOTNET_PATH=$__TOOLRUNTIME_DIR/dotnetcli @@ -12,6 +41,7 @@ __BUILD_TOOLS_PATH=$__PACKAGES_DIR/Microsoft.DotNet.BuildTools/$__BUILD_TOOLS_PA __PROJECT_JSON_PATH=$__TOOLRUNTIME_DIR/$__BUILD_TOOLS_PACKAGE_VERSION __PROJECT_JSON_FILE=$__PROJECT_JSON_PATH/project.json __PROJECT_JSON_CONTENTS="{ \"dependencies\": { \"Microsoft.DotNet.BuildTools\": \"$__BUILD_TOOLS_PACKAGE_VERSION\" }, \"frameworks\": { \"dnxcore50\": { } } }" +__DistroName="" OSName=$(uname -s) case $OSName in @@ -32,6 +62,16 @@ case $OSName in ;; esac +# Initialize Linux Distribution name and .NET CLI package name. + +initDistroName $OS +if [ "$__DistroName" == "centos" ]; then + __DOTNET_PKG=dotnet-centos-x64 +fi + +__CLIDownloadURL=https://dotnetcli.blob.core.windows.net/dotnet/dev/Binaries/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_TOOLS_VERSION}.tar.gz +echo ".NET CLI will be downloaded from $__CLIDownloadURL" + if [ ! -e $__PROJECT_JSON_FILE ]; then if [ -e $__TOOLRUNTIME_DIR ]; then rm -rf -- $__TOOLRUNTIME_DIR; fi @@ -40,9 +80,9 @@ if [ ! -e $__PROJECT_JSON_FILE ]; then which curl > /dev/null 2> /dev/null if [ $? -ne 0 ]; then mkdir -p "$__DOTNET_PATH" - wget -q -O $__DOTNET_PATH/dotnet.tar https://dotnetcli.blob.core.windows.net/dotnet/dev/Binaries/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_TOOLS_VERSION}.tar.gz + wget -q -O $__DOTNET_PATH/dotnet.tar $__CLIDownloadURL else - curl -sSL --create-dirs -o $__DOTNET_PATH/dotnet.tar https://dotnetcli.blob.core.windows.net/dotnet/dev/Binaries/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_TOOLS_VERSION}.tar.gz + curl -sSL --create-dirs -o $__DOTNET_PATH/dotnet.tar $__CLIDownloadURL fi cd $__DOTNET_PATH tar -xf $__DOTNET_PATH/dotnet.tar diff --git a/src/.nuget/.gitmirror b/src/.nuget/.gitmirrorall index f507630f94..f507630f94 100644 --- a/src/.nuget/.gitmirror +++ b/src/.nuget/.gitmirrorall diff --git a/src/.nuget/Microsoft.DotNet.CoreCLR.Debug.Development.nuspec b/src/.nuget/Microsoft.DotNet.CoreCLR.Debug.Development.nuspec deleted file mode 100644 index 4fbbdf5791..0000000000 --- a/src/.nuget/Microsoft.DotNet.CoreCLR.Debug.Development.nuspec +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0"?> -<package > - <metadata> - <id>Microsoft.DotNet.CoreCLR.Debug.Development</id> - <version>1.0.3-prerelease</version> - <title>Microsoft DotNet CoreCLR Runtime For Component Development</title> - <authors>Microsoft</authors> - <owners>Microsoft</owners> - <licenseUrl>http://go.microsoft.com/fwlink/?LinkId=329770</licenseUrl> - <projectUrl>https://github.com/dotnet/coreclr</projectUrl> - <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl> - <requireLicenseAcceptance>true</requireLicenseAcceptance> - <description>Provides the CoreCLR runtime binaries with debug information and interface headers</description> - <releaseNotes>Initial release</releaseNotes> - <copyright>Copyright © Microsoft Corporation</copyright> - </metadata> - <files> - <file src="..\clretwrc.dll" target="lib\aspnetcore50\clretwrc.dll" /> - <file src="..\coreclr.dll" target="lib\aspnetcore50\coreclr.dll" /> - <file src="..\mscordaccore.dll" target="lib\aspnetcore50\mscordaccore.dll" /> - <file src="..\mscordbi.dll" target="lib\aspnetcore50\mscordbi.dll" /> - <file src="..\mscorrc.dll" target="lib\aspnetcore50\mscorrc.dll" /> - <file src="..\mscorrc.debug.dll" target="lib\aspnetcore50\mscorrc.debug.dll" /> - <file src="..\corerun.exe" target="lib\aspnetcore50\corerun.exe" /> - <file src="..\mscorlib.dll" target="lib\aspnetcore50\mscorlib.dll" /> - <file src="..\sos.dll" target="lib\aspnetcore50\sos.dll" /> - <file src="..\PDB\clretwrc.pdb" target="lib\aspnetcore50\clretwrc.pdb" /> - <file src="..\PDB\coreclr.pdb" target="lib\aspnetcore50\coreclr.pdb" /> - <file src="..\PDB\corerun.pdb" target="lib\aspnetcore50\corerun.pdb" /> - <file src="..\PDB\mscordaccore.pdb" target="lib\aspnetcore50\mscordaccore.pdb" /> - <file src="..\PDB\mscordbi.pdb" target="lib\aspnetcore50\mscordbi.pdb" /> - <file src="..\PDB\mscorrc.pdb" target="lib\aspnetcore50\mscorrc.pdb" /> - <file src="..\PDB\mscorrc.debug.pdb" target="lib\aspnetcore50\mscorrc.debug.pdb" /> - <file src="..\PDB\corerun.pdb" target="lib\aspnetcore50\corerun.pdb" /> - <file src="..\PDB\sos.pdb" target="lib\aspnetcore50\sos.pdb" /> - <file src="..\PDB\mscorlib.pdb" target="lib\aspnetcore50\mscorlib.pdb" /> - <file src="..\inc\cor.h" target="inc\cor.h" /> - <file src="..\inc\corerror.h" target="inc\corerror.h" /> - <file src="..\inc\corhdr.h" target="inc\corhdr.h" /> - <file src="..\inc\corinfo.h" target="inc\corinfo.h" /> - <file src="..\inc\corjit.h" target="inc\corjit.h" /> - <file src="..\inc\opcode.def" target="inc\opcode.def" /> - <file src="..\inc\openum.h" target="inc\openum.h" /> - <file src="..\inc\gcinfoencoder.h" target="inc\gcinfoencoder.h" /> - <file src="..\inc\gcinfotypes.h" target="inc\gcinfotypes.h" /> - <file src="..\gcinfo\gcinfoencoder.cpp" target="gcinfo\gcinfoencoder.cpp" /> - </files> -</package> diff --git a/src/.nuget/Microsoft.DotNet.CoreCLR.Development.nuspec b/src/.nuget/Microsoft.DotNet.CoreCLR.Development.nuspec deleted file mode 100644 index fe3a59f472..0000000000 --- a/src/.nuget/Microsoft.DotNet.CoreCLR.Development.nuspec +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0"?> -<package > - <metadata> - <id>Microsoft.DotNet.CoreCLR.Development</id> - <version>1.0.3-prerelease</version> - <title>Microsoft DotNet CoreCLR Runtime For Component Development</title> - <authors>Microsoft</authors> - <owners>Microsoft</owners> - <licenseUrl>http://go.microsoft.com/fwlink/?LinkId=329770</licenseUrl> - <projectUrl>https://github.com/dotnet/coreclr</projectUrl> - <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl> - <requireLicenseAcceptance>true</requireLicenseAcceptance> - <description>Provides the CoreCLR runtime binaries with debug information and interface headers</description> - <releaseNotes>Initial release</releaseNotes> - <copyright>Copyright © Microsoft Corporation</copyright> - </metadata> - <files> - <file src="..\clretwrc.dll" target="lib\aspnetcore50\clretwrc.dll" /> - <file src="..\coreclr.dll" target="lib\aspnetcore50\coreclr.dll" /> - <file src="..\mscordaccore.dll" target="lib\aspnetcore50\mscordaccore.dll" /> - <file src="..\mscordbi.dll" target="lib\aspnetcore50\mscordbi.dll" /> - <file src="..\mscorrc.dll" target="lib\aspnetcore50\mscorrc.dll" /> - <file src="..\mscorrc.debug.dll" target="lib\aspnetcore50\mscorrc.debug.dll" /> - <file src="..\corerun.exe" target="lib\aspnetcore50\corerun.exe" /> - <file src="..\mscorlib.dll" target="lib\aspnetcore50\mscorlib.dll" /> - <file src="..\sos.dll" target="lib\aspnetcore50\sos.dll" /> - <file src="..\PDB\clretwrc.pdb" target="lib\aspnetcore50\clretwrc.pdb" /> - <file src="..\PDB\coreclr.pdb" target="lib\aspnetcore50\coreclr.pdb" /> - <file src="..\PDB\corerun.pdb" target="lib\aspnetcore50\corerun.pdb" /> - <file src="..\PDB\mscordaccore.pdb" target="lib\aspnetcore50\mscordaccore.pdb" /> - <file src="..\PDB\mscordbi.pdb" target="lib\aspnetcore50\mscordbi.pdb" /> - <file src="..\PDB\mscorrc.pdb" target="lib\aspnetcore50\mscorrc.pdb" /> - <file src="..\PDB\mscorrc.debug.pdb" target="lib\aspnetcore50\mscorrc.debug.pdb" /> - <file src="..\PDB\corerun.pdb" target="lib\aspnetcore50\corerun.pdb" /> - <file src="..\PDB\sos.pdb" target="lib\aspnetcore50\sos.pdb" /> - <file src="..\PDB\mscorlib.pdb" target="lib\aspnetcore50\mscorlib.pdb" /> - <file src="..\inc\cor.h" target="inc\cor.h" /> - <file src="..\inc\corerror.h" target="inc\corerror.h" /> - <file src="..\inc\corhdr.h" target="inc\corhdr.h" /> - <file src="..\inc\corinfo.h" target="inc\corinfo.h" /> - <file src="..\inc\corjit.h" target="inc\corjit.h" /> - <file src="..\inc\opcode.def" target="inc\opcode.def" /> - <file src="..\inc\openum.h" target="inc\openum.h" /> - <file src="..\inc\gcinfoencoder.h" target="inc\gcinfoencoder.h" /> - <file src="..\inc\gcinfotypes.h" target="inc\gcinfotypes.h" /> - <file src="..\.\gcinfo\gcinfoencoder.cpp" target="gcinfo\gcinfoencoder.cpp" /> - </files> -</package> diff --git a/src/.nuget/Microsoft.DotNet.CoreCLR.nuspec b/src/.nuget/Microsoft.DotNet.CoreCLR.nuspec deleted file mode 100644 index a56a9ce5e3..0000000000 --- a/src/.nuget/Microsoft.DotNet.CoreCLR.nuspec +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0"?> -<package > - <metadata> - <id>Microsoft.DotNet.CoreCLR</id> - <version>1.0.3-prerelease</version> - <title>Microsoft DotNet CoreCLR Runtime</title> - <authors>Microsoft</authors> - <owners>Microsoft</owners> - <licenseUrl>http://go.microsoft.com/fwlink/?LinkId=329770</licenseUrl> - <projectUrl>https://github.com/dotnet/coreclr</projectUrl> - <iconUrl>http://go.microsoft.com/fwlink/?LinkID=288859</iconUrl> - <requireLicenseAcceptance>true</requireLicenseAcceptance> - <description>Provides the CoreCLR runtime binaries to run managed code.</description> - <releaseNotes>Initial release</releaseNotes> - <copyright>Copyright © Microsoft Corporation</copyright> - </metadata> - <files> - <file src="..\clretwrc.dll" target="lib\aspnetcore50\clretwrc.dll" /> - <file src="..\coreclr.dll" target="lib\aspnetcore50\coreclr.dll" /> - <file src="..\mscordaccore.dll" target="lib\aspnetcore50\mscordaccore.dll" /> - <file src="..\mscordbi.dll" target="lib\aspnetcore50\mscordbi.dll" /> - <file src="..\mscorrc.dll" target="lib\aspnetcore50\mscorrc.dll" /> - <file src="..\mscorrc.debug.dll" target="lib\aspnetcore50\mscorrc.debug.dll" /> - <file src="..\corerun.exe" target="lib\aspnetcore50\corerun.exe" /> - <file src="..\mscorlib.dll" target="lib\aspnetcore50\mscorlib.dll" /> - </files> -</package> diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds new file mode 100644 index 0000000000..faa46dd61b --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.builds @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <!-- This property must be set to the same value as $(PackageOutputPath) for the nuspecs and nupkgs to be binplaced to the intended location. --> + <OutputPath>$(PackageOutputPath)</OutputPath> + </PropertyGroup> + + <!-- We always build the identity/redirection package. However, the platform specific runtime-*.nupkg is built based upon the target OS we are building the product for. --> + <ItemGroup> + <Project Include="Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + </Project> + <Project Condition="'$(TargetsWindows)' == 'true'" Include="win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <OSGroup>Windows_NT</OSGroup> + <Platform>amd64</Platform> + </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroName)' == 'rhel'" Include="rhel/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroName)' == 'debian'" Include="debian/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> + <Project Condition="'$(TargetsLinux)' == 'true' and '$(DistroName)' == 'ubuntu'" Include="ubuntu/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <OSGroup>Linux</OSGroup> + <Platform>amd64</Platform> + </Project> + <Project Condition="'$(TargetsOSX)' == 'true'" Include="osx/Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <OSGroup>OSX</OSGroup> + <Platform>amd64</Platform> + </Project> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" /> +</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj new file mode 100644 index 0000000000..18a64d5bee --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.1</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <SkipValidatePackage>true</SkipValidatePackage> + <PackagePlatforms>x64;x86;arm</PackagePlatforms> + <OutputPath>$(PackagesOutputPath)</OutputPath> + </PropertyGroup> + + <ItemGroup> + <ProjectReference Include="win\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> + <ProjectReference Include="win\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <Platform>x86</Platform> + </ProjectReference> + <ProjectReference Include="win\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <Platform>arm</Platform> + </ProjectReference> + <ProjectReference Include="rhel\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> + <ProjectReference Include="debian\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> + <ProjectReference Include="osx\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> + <ProjectReference Include="ubuntu\Microsoft.NETCore.Runtime.CoreCLR.pkgproj"> + <Platform>amd64</Platform> + </ProjectReference> + + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/debian/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/debian/Microsoft.NETCore.Runtime.CoreCLR.pkgproj new file mode 100644 index 0000000000..08da737859 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/debian/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.1</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>debian.8.2-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + + <ItemGroup> + + <ArchitectureSpecificNativeFile Include="$(BinDir)libcoreclr.so"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)libcoreclrtraceptprovider.so"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)libdbgshim.so"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)libmscordaccore.so"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)libmscordbi.so"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)libsos.so"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)libsosplugin.so"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)System.Globalization.Native.so" /> + + <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll"/> + + <ArchitectureSpecificToolFile Include="$(BinDir)crossgen"/> + + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + + <!-- Using lib/dotnet here. There is no TFM for this since it is a runtime itself. --> + <File Include="@(ArchitectureSpecificLibFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/lib/dotnet</TargetPath> + </File> + + <!-- No reference: don't permit reference to the implementation from lib --> + <File Include="$(PlaceholderFile)"> + <TargetPath>ref/dotnet</TargetPath> + </File> + + <File Include="@(ArchitectureSpecificToolFile)"> + <TargetPath>tools</TargetPath> + </File> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/osx/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/osx/Microsoft.NETCore.Runtime.CoreCLR.pkgproj new file mode 100644 index 0000000000..f02ed95812 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/osx/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.1</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>osx.10.10-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + + <ItemGroup> + + <ArchitectureSpecificNativeFile Include="$(BinDir)libcoreclr.dylib"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)libdbgshim.dylib"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)libmscordaccore.dylib"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)libmscordbi.dylib"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)libsos.dylib"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)System.Globalization.Native.dylib"/> + + <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll"/> + + <ArchitectureSpecificToolFile Include="$(BinDir)crossgen"/> + + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + + <!-- Using lib/dotnet here. There is no TFM for this since it is a runtime itself. --> + <File Include="@(ArchitectureSpecificLibFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/lib/dotnet</TargetPath> + </File> + + <!-- No reference: don't permit reference to the implementation from lib --> + <File Include="$(PlaceholderFile)"> + <TargetPath>ref/dotnet</TargetPath> + </File> + + <File Include="@(ArchitectureSpecificToolFile)"> + <TargetPath>tools</TargetPath> + </File> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/rhel/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/rhel/Microsoft.NETCore.Runtime.CoreCLR.pkgproj new file mode 100644 index 0000000000..1b794a5834 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/rhel/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.1</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>rhel.7-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + + <ItemGroup> + + <ArchitectureSpecificNativeFile Include="$(BinDir)libcoreclr.so"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)libcoreclrtraceptprovider.so"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)libdbgshim.so"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)libmscordaccore.so"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)libmscordbi.so"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)libsos.so"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)libsosplugin.so"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)System.Globalization.Native.so" /> + + <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll"/> + + <ArchitectureSpecificToolFile Include="$(BinDir)crossgen"/> + + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + + <!-- Using lib/dotnet here. There is no TFM for this since it is a runtime itself. --> + <File Include="@(ArchitectureSpecificLibFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/lib/dotnet</TargetPath> + </File> + + <!-- No reference: don't permit reference to the implementation from lib --> + <File Include="$(PlaceholderFile)"> + <TargetPath>ref/dotnet</TargetPath> + </File> + + <File Include="@(ArchitectureSpecificToolFile)"> + <TargetPath>tools</TargetPath> + </File> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/Microsoft.NETCore.Runtime.CoreCLR.pkgproj new file mode 100644 index 0000000000..df87d92385 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/ubuntu/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.1</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <PackageTargetRuntime>ubuntu.14.04-$(PackagePlatform)</PackageTargetRuntime> + <!-- only build for x64 --> + <PackagePlatforms>x64;</PackagePlatforms> + </PropertyGroup> + + <ItemGroup> + + <ArchitectureSpecificNativeFile Include="$(BinDir)libcoreclr.so"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)libcoreclrtraceptprovider.so"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)libdbgshim.so"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)libmscordaccore.so"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)libmscordbi.so"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)libsos.so"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)libsosplugin.so"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)System.Globalization.Native.so"/> + + <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll"/> + + <ArchitectureSpecificToolFile Include="$(BinDir)crossgen"/> + + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + + <!-- Using lib/dotnet here. There is no TFM for this since it is a runtime itself. --> + <File Include="@(ArchitectureSpecificLibFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/lib/dotnet</TargetPath> + </File> + + <!-- No reference: don't permit reference to the implementation from lib --> + <File Include="$(PlaceholderFile)"> + <TargetPath>ref/dotnet</TargetPath> + </File> + + <File Include="@(ArchitectureSpecificToolFile)"> + <TargetPath>tools</TargetPath> + </File> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project>
\ No newline at end of file diff --git a/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj new file mode 100644 index 0000000000..f1859e4d2c --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/win/Microsoft.NETCore.Runtime.CoreCLR.pkgproj @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> + + <PropertyGroup> + <Version>1.0.1</Version> + <SkipPackageFileCheck>true</SkipPackageFileCheck> + <MinOSForArch>win7</MinOSForArch> + <MinOSForArch Condition="$(PackagePlatform.StartsWith('arm'))">win8</MinOSForArch> + <PackageTargetRuntime>$(MinOSForArch)-$(PackagePlatform)</PackageTargetRuntime> + </PropertyGroup> + + <ItemGroup> + + <!-- Windows nuget package will depend upon the APISet package --> + <Dependency Include="Microsoft.NETCore.Windows.ApiSets"> + <Version>1.0.1-rc3-23803</Version> + </Dependency> + + <ArchitectureSpecificNativeFile Include="$(BinDir)clretwrc.dll"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)coreclr.dll"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)dbgshim.dll"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)mscordaccore.dll"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)mscordbi.dll"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)mscorlib.ni.dll"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)mscorrc.debug.dll"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)mscorrc.dll"/> + <ArchitectureSpecificNativeFile Include="$(BinDir)sos.dll"/> + + <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll"/> + + <ArchitectureSpecificToolFile Include="$(BinDir)crossgen.exe"/> + + <File Include="@(ArchitectureSpecificNativeFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/native</TargetPath> + </File> + + <!-- Using lib/dotnet here. There is no TFM for this since it is a runtime itself. --> + <File Include="@(ArchitectureSpecificLibFile)"> + <TargetPath>runtimes/$(PackageTargetRuntime)/lib/dotnet</TargetPath> + </File> + + <File Include="@(ArchitectureSpecificToolFile)"> + <TargetPath>tools</TargetPath> + </File> + + <!-- No reference: don't permit reference to the implementation from lib --> + <File Include="$(PlaceholderFile)"> + <TargetPath>ref/dotnet</TargetPath> + </File> + </ItemGroup> + + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> +</Project>
\ No newline at end of file diff --git a/src/.nuget/ThirdPartyNotices.txt b/src/.nuget/ThirdPartyNotices.txt new file mode 100644 index 0000000000..55cfb20817 --- /dev/null +++ b/src/.nuget/ThirdPartyNotices.txt @@ -0,0 +1,31 @@ +This Microsoft .NET Library may incorporate components from the projects listed +below. Microsoft licenses these components under the Microsoft .NET Library +software license terms. The original copyright notices and the licenses under +which Microsoft received such components are set forth below for informational +purposes only. Microsoft reserves all rights not expressly granted herein, +whether by implication, estoppel or otherwise. + +1. .NET Core (https://github.com/dotnet/core/) + +.NET Core +Copyright (c) .NET Foundation and Contributors + +The MIT License (MIT) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE.
\ No newline at end of file diff --git a/src/.nuget/descriptions.json b/src/.nuget/descriptions.json new file mode 100644 index 0000000000..23b2e2eba3 --- /dev/null +++ b/src/.nuget/descriptions.json @@ -0,0 +1,12 @@ +[ + { + "Name": "RuntimePackage", + "Description": "Internal implementation package not meant for direct consumption. Please do not reference directly.", + "CommonTypes": [ ] + }, + { + "Name": "Microsoft.NETCore.Runtime.CoreCLR", + "Description": "The .NET Core runtime, called CoreCLR, and the base library, called mscorlib. It includes the garbage collector, JIT compiler, base .NET data types and many low-level classes.", + "CommonTypes": [ ] + } +] diff --git a/src/.nuget/dotnet_library_license.txt b/src/.nuget/dotnet_library_license.txt new file mode 100644 index 0000000000..9953cbbffb --- /dev/null +++ b/src/.nuget/dotnet_library_license.txt @@ -0,0 +1,127 @@ +MICROSOFT SOFTWARE LICENSE TERMS + + +MICROSOFT .NET LIBRARY + +These license terms are an agreement between Microsoft Corporation (or based on where you live, one of its affiliates) and you. Please read them. They apply to the software named above, which includes the media on which you received it, if any. The terms also apply to any Microsoft + +- updates, + +- supplements, + +- Internet-based services, and + +- support services + +for this software, unless other terms accompany those items. If so, those terms apply. + +BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS. IF YOU DO NOT ACCEPT THEM, DO NOT USE THE SOFTWARE. + + +IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE PERPETUAL RIGHTS BELOW. + +1. INSTALLATION AND USE RIGHTS. + +a. Installation and Use. You may install and use any number of copies of the software to design, develop and test your programs. + +b. Third Party Programs. The software may include third party programs that Microsoft, not the third party, licenses to you under this agreement. Notices, if any, for the third party program are included for your information only. + +2. ADDITIONAL LICENSING REQUIREMENTS AND/OR USE RIGHTS. + +a. DISTRIBUTABLE CODE. The software is comprised of Distributable Code. "Distributable Code" is code that you are permitted to distribute in programs you develop if you comply with the terms below. + +i. Right to Use and Distribute. + +- You may copy and distribute the object code form of the software. + +- Third Party Distribution. You may permit distributors of your programs to copy and distribute the Distributable Code as part of those programs. + +ii. Distribution Requirements. For any Distributable Code you distribute, you must + +- add significant primary functionality to it in your programs; + +- require distributors and external end users to agree to terms that protect it at least as much as this agreement; + +- display your valid copyright notice on your programs; and + +- indemnify, defend, and hold harmless Microsoft from any claims, including attorneys' fees, related to the distribution or use of your programs. + +iii. Distribution Restrictions. You may not + +- alter any copyright, trademark or patent notice in the Distributable Code; + +- use Microsoft's trademarks in your programs' names or in a way that suggests your programs come from or are endorsed by Microsoft; + +- include Distributable Code in malicious, deceptive or unlawful programs; or + +- modify or distribute the source code of any Distributable Code so that any part of it becomes subject to an Excluded License. An Excluded License is one that requires, as a condition of use, modification or distribution, that + +- the code be disclosed or distributed in source code form; or + +- others have the right to modify it. + +3. SCOPE OF LICENSE. The software is licensed, not sold. This agreement only gives you some rights to use the software. Microsoft reserves all other rights. Unless applicable law gives you more rights despite this limitation, you may use the software only as expressly permitted in this agreement. In doing so, you must comply with any technical limitations in the software that only allow you to use it in certain ways. You may not + +- work around any technical limitations in the software; + +- reverse engineer, decompile or disassemble the software, except and only to the extent that applicable law expressly permits, despite this limitation; + +- publish the software for others to copy; + +- rent, lease or lend the software; + +- transfer the software or this agreement to any third party; or + +- use the software for commercial software hosting services. + +4. BACKUP COPY. You may make one backup copy of the software. You may use it only to reinstall the software. + +5. DOCUMENTATION. Any person that has valid access to your computer or internal network may copy and use the documentation for your internal, reference purposes. + +6. EXPORT RESTRICTIONS. The software is subject to United States export laws and regulations. You must comply with all domestic and international export laws and regulations that apply to the software. These laws include restrictions on destinations, end users and end use. For additional information, see www.microsoft.com/exporting. + +7. SUPPORT SERVICES. Because this software is "as is," we may not provide support services for it. + +8. ENTIRE AGREEMENT. This agreement, and the terms for supplements, updates, Internet-based services and support services that you use, are the entire agreement for the software and support services. + +9. APPLICABLE LAW. + +a. United States. If you acquired the software in the United States, Washington state law governs the interpretation of this agreement and applies to claims for breach of it, regardless of conflict of laws principles. The laws of the state where you live govern all other claims, including claims under state consumer protection laws, unfair competition laws, and in tort. + +b. Outside the United States. If you acquired the software in any other country, the laws of that country apply. + +10. LEGAL EFFECT. This agreement describes certain legal rights. You may have other rights under the laws of your country. You may also have rights with respect to the party from whom you acquired the software. This agreement does not change your rights under the laws of your country if the laws of your country do not permit it to do so. + +11. DISCLAIMER OF WARRANTY. THE SOFTWARE IS LICENSED "AS-IS." YOU BEAR THE RISK OF USING IT. MICROSOFT GIVES NO EXPRESS WARRANTIES, GUARANTEES OR CONDITIONS. YOU MAY HAVE ADDITIONAL CONSUMER RIGHTS OR STATUTORY GUARANTEES UNDER YOUR LOCAL LAWS WHICH THIS AGREEMENT CANNOT CHANGE. TO THE EXTENT PERMITTED UNDER YOUR LOCAL LAWS, MICROSOFT EXCLUDES THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. + +FOR AUSTRALIA - YOU HAVE STATUTORY GUARANTEES UNDER THE AUSTRALIAN CONSUMER LAW AND NOTHING IN THESE TERMS IS INTENDED TO AFFECT THOSE RIGHTS. + +12. LIMITATION ON AND EXCLUSION OF REMEDIES AND DAMAGES. YOU CAN RECOVER FROM MICROSOFT AND ITS SUPPLIERS ONLY DIRECT DAMAGES UP TO U.S. $5.00. YOU CANNOT RECOVER ANY OTHER DAMAGES, INCLUDING CONSEQUENTIAL, LOST PROFITS, SPECIAL, INDIRECT OR INCIDENTAL DAMAGES. + +This limitation applies to + +- anything related to the software, services, content (including code) on third party Internet sites, or third party programs; and + +- claims for breach of contract, breach of warranty, guarantee or condition, strict liability, negligence, or other tort to the extent permitted by applicable law. + +It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages. + +Please note: As this software is distributed in Quebec, Canada, some of the clauses in this agreement are provided below in French. + +Remarque : Ce logiciel etant distribue au Quebec, Canada, certaines des clauses dans ce contrat sont fournies ci-dessous en francais. + +EXONERATION DE GARANTIE. Le logiciel vise par une licence est offert << tel quel >>. Toute utilisation de ce logiciel est a votre seule risque et peril. Microsoft n'accorde aucune autre garantie expresse. Vous pouvez beneficier de droits additionnels en vertu du droit local sur la protection des consommateurs, que ce contrat ne peut modifier. La ou elles sont permises par le droit locale, les garanties implicites de qualite marchande, d'adequation a un usage particulier et d'absence de contrefacon sont exclues. + +LIMITATION DES DOMMAGES-INTERETS ET EXCLUSION DE RESPONSABILITE POUR LES DOMMAGES. Vous pouvez obtenir de Microsoft et de ses fournisseurs une indemnisation en cas de dommages directs uniquement a hauteur de 5,00 $ US. Vous ne pouvez pretendre a aucune indemnisation pour les autres dommages, y compris les dommages speciaux, indirects ou accessoires et pertes de benefices. + +Cette limitation concerne : + +- tout ce qui est relie au logiciel, aux services ou au contenu (y compris le code) figurant sur des sites Internet tiers ou dans des programmes tiers ; et + +- les reclamations au titre de violation de contrat ou de garantie, ou au titre de responsabilite stricte, de negligence ou d'une autre faute dans la limite autorisee par la loi en vigueur. + +Elle s'applique egalement, meme si Microsoft connaissait ou devrait connaitre l'eventualite d'un tel dommage. Si votre pays n'autorise pas l'exclusion ou la limitation de responsabilite pour les dommages indirects, accessoires ou de quelque nature que ce soit, il se peut que la limitation ou l'exclusion ci-dessus ne s'appliquera pas a votre egard. + +EFFET JURIDIQUE. Le present contrat decrit certains droits juridiques. Vous pourriez avoir d'autres droits prevus par les lois de votre pays. Le present contrat ne modifie pas les droits que vous conferent les lois de votre pays si celles-ci ne le permettent pas. + + diff --git a/src/.nuget/init/project.json b/src/.nuget/init/project.json new file mode 100644 index 0000000000..4a4bc0d7e2 --- /dev/null +++ b/src/.nuget/init/project.json @@ -0,0 +1,10 @@ +{ + "dependencies": { + "Microsoft.NETCore.Platforms": "1.0.1-rc2-23712", + }, + "frameworks": { + "dnxcore50": { + "imports": "portable-net45+win8" + } + }, +}
\ No newline at end of file diff --git a/src/.nuget/init/readme.txt b/src/.nuget/init/readme.txt new file mode 100644 index 0000000000..6792dd555f --- /dev/null +++ b/src/.nuget/init/readme.txt @@ -0,0 +1 @@ +Please keep the package details listed in project.json in sync with <repo_root>/dir.props.
\ No newline at end of file diff --git a/src/build.proj b/src/build.proj index dff408ea1a..f727bf3a80 100644 --- a/src/build.proj +++ b/src/build.proj @@ -17,7 +17,7 @@ <NugetPackageBuildTargets>BuildNuGetPackages</NugetPackageBuildTargets> </PropertyGroup> - <!-- Generate Microsoft.Dotnet.CoreCLR nuget package and associated development package --> + <!-- Generate RyuJIT nuget package --> <Target Name="BuildNuGetPackages" AfterTargets="MovePDB" Condition="'$(BuildNugetPackage)' != 'false'"> <MakeDir Directories="$(PackagesBinDir)" Condition="!Exists('$(PackagesBinDir)')" /> <Copy SourceFiles="@(NuSpecSrcs)" DestinationFolder="$(PackagesBinDir)" /> |