Selective integration of CoreCLR PR #27836#25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trylek merged 1 commit into from
Nov 13, 2019
Merged

Selective integration of CoreCLR PR #27836 #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion eng/helixcorefxtests.proj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,6 +85,7 @@
TODO: ProjectDir, RootBinDir, TestWorkingDir, and TargetsWindows are global properties set in dir.props, remove the property assignment here when we port to arcade.
-->
<ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)..\</ProjectDir>
<ProjectDir Condition="Exists('$(ProjectDir).dotnet-runtime-placeholder')">$(ProjectDir)\src\coreclr\</ProjectDir>
<RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir>
<TestWorkingDir Condition="'$(__TestWorkingDir)'==''">$(RootBinDir)tests\$(__BuildOS).$(__BuildArch).$(__BuildType)\</TestWorkingDir>
<TargetsWindows Condition="'$(__BuildOS)' == 'Windows_NT'">true</TargetsWindows>
Expand DownExpand Up@@ -149,7 +150,7 @@
</PropertyGroup>

<ItemGroup>
<_ProjectsToBuild Include="..\tests\testenvironment.proj">
<_ProjectsToBuild Include="$(ProjectDir)tests\testenvironment.proj">
<Properties>Scenario=$(Scenario);TestEnvFileName=$(TestEnvFilePath);TargetsWindows=$(TargetsWindows)</Properties>
</_ProjectsToBuild>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/coreclr/templates/build-test-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
displayName: Install native dependencies
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
# Necessary to install correct cmake version
- script: $(coreClrRepoRootDir)eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
- script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
displayName: Install native dependencies


Expand Down
20 changes: 8 additions & 12 deletions eng/pipelines/coreclr/templates/crossgen-comparison-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -40,14 +40,14 @@ jobs:
value: $(osGroup).$(hostArchType)_$(archType).$(buildConfigUpper)
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
- name: binDirectory
value: $(Build.SourcesDirectory)/bin
value: $(coreClrRepoRoot)/bin
- name: productDirectory
value: $(Build.SourcesDirectory)/bin/Product
value: $(binDirectory)/Product
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
- name: binDirectory
value: $(Build.SourcesDirectory)\bin
value: $(coreClrRepoRoot)\bin
- name: productDirectory
value: $(Build.SourcesDirectory)\bin\Product
value: $(binDirectory\Product

# Test job depends on the corresponding build job
dependsOn: ${{ format('build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
Expand DownExpand Up@@ -83,20 +83,16 @@ jobs:


# Populate Core_Root
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
- script: ./build-test.sh $(buildConfig) $(archType) $(crossArg) generatelayoutonly
displayName: Populate Core_Root
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
- script: build-test.cmd $(buildConfig) $(archType) generateLayoutOnly
displayName: Populate Core_Root
- script: $(coreClrRepoRootDir)build-test$(scriptExt) $(buildConfig) $(archType) $(crossArg) generatelayoutonly
displayName: Populate Core_Root


# Create baseline output on the host (x64) machine
- task: PythonScript@0
displayName: Create cross-platform crossgen baseline
inputs:
scriptSource: 'filePath'
scriptPath: $(Build.SourcesDirectory)/tests/scripts/crossgen_comparison.py
scriptPath: $(coreClrRepoRoot)/tests/scripts/crossgen_comparison.py
${{ if ne(parameters.osGroup, 'Windows_NT') }}:
arguments:
crossgen_framework
Expand DownExpand Up@@ -126,7 +122,7 @@ jobs:
Creator: $(Creator)
WorkItemTimeout: 1:00 # 1 hour
WorkItemDirectory: '$(binDirectory)'
CorrelationPayloadDirectory: '$(Build.SourcesDirectory)/tests/scripts'
CorrelationPayloadDirectory: '$(coreClrRepoRoot)/tests/scripts'
${{ if ne(parameters.osName, 'Windows_NT') }}:
WorkItemCommand:
chmod +x $HELIX_WORKITEM_PAYLOAD/Product/$(targetFlavor)/crossgen;
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/coreclr/templates/perf-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,9 @@ jobs:

# Create Core_Root
- ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
- script: ./build-test.sh ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
- script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
displayName: Create Core_Root
- ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
# TODO: add generatelayoutonly to build-test.cmd.
- script: build-test.cmd ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
- script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
displayName: Create Core_Root
2 changes: 1 addition & 1 deletion eng/pipelines/coreclr/templates/run-test-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -250,7 +250,7 @@ jobs:

# Choose which tests to send to Helix: CoreFX or CoreCLR.
${{ if eq(parameters.corefxTests, true) }}:
helixProjectArguments: '$(coreClrRepoRoot)/eng/helixcorefxtests.proj'
helixProjectArguments: '$(Build.SourcesDirectory)/eng/helixcorefxtests.proj'
${{ if ne(parameters.corefxTests, true) }}:
helixProjectArguments: '$(coreClrRepoRoot)/tests/src/helixpublishwitharcade.proj'

Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/coreclr/templates/xplat-pipeline-job.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -80,9 +80,9 @@ jobs:
value: '/'

- name: coreClrRepoRoot
value: '$(Build.SourcesDirectory)/src/coreclr
value: '$(Build.SourcesDirectory)/src/coreclr'

- ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:'
- ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:

- name: coreClrRepoRoot
value: '$(Build.SourcesDirectory)'
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/build-test.cmd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -276,7 +276,7 @@ if "%__SkipRestorePackages%" == "1" goto SkipRestoreProduct
echo %__MsgPrefix%Restoring CoreCLR product from packages

if not defined XunitTestBinBase set XunitTestBinBase=%__TestBinDir%
set "CORE_ROOT=%XunitTestBinBase%\Tests\Core_Root"
set "CORE_ROOT=%XunitTestBinBase%\Tests\Core_Root\"

set __BuildLogRootName=Restore_Product
set __BuildLog=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.log
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/build.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ build_native()
__versionSourceFile="$intermediatesForBuild/version.c"
if [ $__SkipGenerateVersion == 0 ]; then
pwd
"$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__ProjectRoot/eng/empty.csproj \
"$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__RepoRootDir/eng/empty.csproj \
/p:NativeVersionFile=$__versionSourceFile \
/t:GenerateNativeVersionFile /restore \
$__CommonMSBuildArgs $__UnprocessedBuildArgs
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/tests/runtest.cmd
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ set "__TestWorkingDir=%__RootBinDir%\tests\%__BuildOS%.%__BuildArch%.%__BuildTyp
:: Default global test environment variables
:: REVIEW: are these ever expected to be defined on entry to this script? Why? By whom?
:: REVIEW: XunitTestReportDirBase is not used in this script. Who needs to have it set?
if not defined XunitTestBinBase set XunitTestBinBase=%__TestWorkingDir%
if not defined XunitTestBinBase set XunitTestBinBase=%__TestWorkingDir%\
if not defined XunitTestReportDirBase set XunitTestReportDirBase=%XunitTestBinBase%\Reports\

REM At this point in the script there will be a divergence in how the tests are run.
Expand Down
9 changes: 5 additions & 4 deletions ...reclr/tests/src/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByOut/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
cmake_minimum_required (VERSION 2.6)
project (ReversePInvokePassingByOutNative)
project (RPIP_ByOutNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
include_directories("..")
set(SOURCES
ReversePInvokePassingByOutNative.cpp
)
# Additional files to reference:
# add the executable
add_library (ReversePInvokePassingByOutNative SHARED ${SOURCES})
target_link_libraries(ReversePInvokePassingByOutNative ${LINK_LIBRARIES_ADDITIONAL})
add_library (RPIP_ByOutNative SHARED ${SOURCES})
set_property (TARGET RPIP_ByOutNative PROPERTY OUTPUT_NAME ReversePInvokePassingByOutNative)
target_link_libraries(RPIP_ByOutNative ${LINK_LIBRARIES_ADDITIONAL})
# add the install targets
install (TARGETS ReversePInvokePassingByOutNative DESTINATION bin)
install (TARGETS RPIP_ByOutNative DESTINATION bin)
9 changes: 5 additions & 4 deletions ...reclr/tests/src/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByRef/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
cmake_minimum_required (VERSION 2.6)
project (ReversePInvokePassingByRefNative)
project (RPIP_ByRefNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake")
include_directories("..")
set(SOURCES
ReversePInvokePassingByRefNative.cpp
)
# Additional files to reference:
# add the executable
add_library (ReversePInvokePassingByRefNative SHARED ${SOURCES})
target_link_libraries(ReversePInvokePassingByRefNative ${LINK_LIBRARIES_ADDITIONAL})
add_library (RPIP_ByRefNative SHARED ${SOURCES})
set_property (TARGET RPIP_ByRefNative PROPERTY OUTPUT_NAME ReversePInvokePassingByRefNative)
target_link_libraries(RPIP_ByRefNative ${LINK_LIBRARIES_ADDITIONAL})
# add the install targets
install (TARGETS ReversePInvokePassingByRefNative DESTINATION bin)
install (TARGETS RPIP_ByRefNative DESTINATION bin)
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Selective integration of CoreCLR PR #27836#25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

trylek
merged 1 commit into

from

Nov 13, 2019
 Merged


Selective integration of CoreCLR PR #27836
#25
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
eng/helixcorefxtests.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,6 +85,7 @@
 TODO: ProjectDir, RootBinDir, TestWorkingDir, and TargetsWindows are global properties set in dir.props, remove the property assignment here when we port to arcade.
 -->
 <ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)..\</ProjectDir>
 <ProjectDir Condition="Exists('$(ProjectDir).dotnet-runtime-placeholder')">$(ProjectDir)\src\coreclr\</ProjectDir>
 <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir>
 <TestWorkingDir Condition="'$(__TestWorkingDir)'==''">$(RootBinDir)tests\$(__BuildOS).$(__BuildArch).$(__BuildType)\</TestWorkingDir>
 <TargetsWindows Condition="'$(__BuildOS)' == 'Windows_NT'">true</TargetsWindows>
Expand DownExpand Up@@ -149,7 +150,7 @@
 </PropertyGroup>

 <ItemGroup>
 <_ProjectsToBuild Include="..\tests\testenvironment.proj">
 <_ProjectsToBuild Include="$(ProjectDir)tests\testenvironment.proj">
 <Properties>Scenario=$(Scenario);TestEnvFileName=$(TestEnvFilePath);TargetsWindows=$(TargetsWindows)</Properties>
 </_ProjectsToBuild>
 </ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/build-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
 displayName: Install native dependencies
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 # Necessary to install correct cmake version
 - script: $(coreClrRepoRootDir)eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
 - script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
 displayName: Install native dependencies


Expand Down

20 changes: 8 additions & 12 deletions
eng/pipelines/coreclr/templates/crossgen-comparison-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,14 +40,14 @@ jobs:
 value: $(osGroup).$(hostArchType)_$(archType).$(buildConfigUpper)
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - name: binDirectory
 value: $(Build.SourcesDirectory)/bin
 value: $(coreClrRepoRoot)/bin
 - name: productDirectory
 value: $(Build.SourcesDirectory)/bin/Product
 value: $(binDirectory)/Product
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - name: binDirectory
 value: $(Build.SourcesDirectory)\bin
 value: $(coreClrRepoRoot)\bin
 - name: productDirectory
 value: $(Build.SourcesDirectory)\bin\Product
 value: $(binDirectory\Product

 # Test job depends on the corresponding build job
 dependsOn: ${{ format('build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
Expand DownExpand Up@@ -83,20 +83,16 @@ jobs:


 # Populate Core_Root
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - script: ./build-test.sh $(buildConfig) $(archType) $(crossArg) generatelayoutonly
 displayName: Populate Core_Root
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - script: build-test.cmd $(buildConfig) $(archType) generateLayoutOnly
 displayName: Populate Core_Root
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) $(buildConfig) $(archType) $(crossArg) generatelayoutonly
 displayName: Populate Core_Root


 # Create baseline output on the host (x64) machine
 - task: PythonScript@0
 displayName: Create cross-platform crossgen baseline
 inputs:
 scriptSource: 'filePath'
 scriptPath: $(Build.SourcesDirectory)/tests/scripts/crossgen_comparison.py
 scriptPath: $(coreClrRepoRoot)/tests/scripts/crossgen_comparison.py
 ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 arguments:
 crossgen_framework
Expand DownExpand Up@@ -126,7 +122,7 @@ jobs:
 Creator: $(Creator)
 WorkItemTimeout: 1:00 # 1 hour
 WorkItemDirectory: '$(binDirectory)'
 CorrelationPayloadDirectory: '$(Build.SourcesDirectory)/tests/scripts'
 CorrelationPayloadDirectory: '$(coreClrRepoRoot)/tests/scripts'
 ${{ if ne(parameters.osName, 'Windows_NT') }}:
 WorkItemCommand:
 chmod +x $HELIX_WORKITEM_PAYLOAD/Product/$(targetFlavor)/crossgen;
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/perf-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,9 @@ jobs:

 # Create Core_Root
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - script: ./build-test.sh ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
 displayName: Create Core_Root
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 # TODO: add generatelayoutonly to build-test.cmd.
 - script: build-test.cmd ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
 displayName: Create Core_Root

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/run-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,7 +250,7 @@ jobs:

 # Choose which tests to send to Helix: CoreFX or CoreCLR.
 ${{ if eq(parameters.corefxTests, true) }}:
 helixProjectArguments: '$(coreClrRepoRoot)/eng/helixcorefxtests.proj'
 helixProjectArguments: '$(Build.SourcesDirectory)/eng/helixcorefxtests.proj'
 ${{ if ne(parameters.corefxTests, true) }}:
 helixProjectArguments: '$(coreClrRepoRoot)/tests/src/helixpublishwitharcade.proj'

Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/xplat-pipeline-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,9 +80,9 @@ jobs:
 value: '/'

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)/src/coreclr
 value: '$(Build.SourcesDirectory)/src/coreclr'

 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:'
 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)'
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/build-test.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -276,7 +276,7 @@ if "%__SkipRestorePackages%" == "1" goto SkipRestoreProduct
echo %__MsgPrefix%Restoring CoreCLR product from packages

if not defined XunitTestBinBase set XunitTestBinBase=%__TestBinDir%
set "CORE_ROOT=%XunitTestBinBase%\Tests\Core_Root"
set "CORE_ROOT=%XunitTestBinBase%\Tests\Core_Root\"

set __BuildLogRootName=Restore_Product
set __BuildLog=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.log
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ build_native()
 __versionSourceFile="$intermediatesForBuild/version.c"
 if [ $__SkipGenerateVersion == 0 ]; then
 pwd
 "$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__ProjectRoot/eng/empty.csproj \
 "$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__RepoRootDir/eng/empty.csproj \
 /p:NativeVersionFile=$__versionSourceFile \
 /t:GenerateNativeVersionFile /restore \
 $__CommonMSBuildArgs $__UnprocessedBuildArgs
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/tests/runtest.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ set "__TestWorkingDir=%__RootBinDir%\tests\%__BuildOS%.%__BuildArch%.%__BuildTyp
:: Default global test environment variables
:: REVIEW: are these ever expected to be defined on entry to this script? Why? By whom?
:: REVIEW: XunitTestReportDirBase is not used in this script. Who needs to have it set?
if not defined XunitTestBinBase set XunitTestBinBase=%__TestWorkingDir%
if not defined XunitTestBinBase set XunitTestBinBase=%__TestWorkingDir%\
if not defined XunitTestReportDirBase set XunitTestReportDirBase=%XunitTestBinBase%\Reports\

REM At this point in the script there will be a divergence in how the tests are run.
Expand Down

9 changes: 5 additions & 4 deletions
...reclr/tests/src/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByOut/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
cmake_minimum_required (VERSION 2.6) 
project (ReversePInvokePassingByOutNative) 
project (RPIP_ByOutNative) 
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") 
include_directories("..") 
set(SOURCES 
 ReversePInvokePassingByOutNative.cpp 
) 
# Additional files to reference: 
# add the executable 
add_library (ReversePInvokePassingByOutNative SHARED ${SOURCES}) 
target_link_libraries(ReversePInvokePassingByOutNative ${LINK_LIBRARIES_ADDITIONAL}) 
add_library (RPIP_ByOutNative SHARED ${SOURCES}) 
set_property (TARGET RPIP_ByOutNative PROPERTY OUTPUT_NAME ReversePInvokePassingByOutNative)
target_link_libraries(RPIP_ByOutNative ${LINK_LIBRARIES_ADDITIONAL}) 
# add the install targets 
install (TARGETS ReversePInvokePassingByOutNative DESTINATION bin) 
install (TARGETS RPIP_ByOutNative DESTINATION bin) 

9 changes: 5 additions & 4 deletions
...reclr/tests/src/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByRef/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
cmake_minimum_required (VERSION 2.6) 
project (ReversePInvokePassingByRefNative) 
project (RPIP_ByRefNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") 
include_directories("..") 
set(SOURCES 
 ReversePInvokePassingByRefNative.cpp 
) 
# Additional files to reference: 
# add the executable 
add_library (ReversePInvokePassingByRefNative SHARED ${SOURCES}) 
target_link_libraries(ReversePInvokePassingByRefNative ${LINK_LIBRARIES_ADDITIONAL}) 
add_library (RPIP_ByRefNative SHARED ${SOURCES}) 
set_property (TARGET RPIP_ByRefNative PROPERTY OUTPUT_NAME ReversePInvokePassingByRefNative)
target_link_libraries(RPIP_ByRefNative ${LINK_LIBRARIES_ADDITIONAL}) 
# add the install targets 
install (TARGETS ReversePInvokePassingByRefNative DESTINATION bin) 
install (TARGETS RPIP_ByRefNative DESTINATION bin) 

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Selective integration of CoreCLR PR #27836#25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

trylek
merged 1 commit into

from

Nov 13, 2019
 Merged


Selective integration of CoreCLR PR #27836
#25
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
eng/helixcorefxtests.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,6 +85,7 @@
 TODO: ProjectDir, RootBinDir, TestWorkingDir, and TargetsWindows are global properties set in dir.props, remove the property assignment here when we port to arcade.
 -->
 <ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)..\</ProjectDir>
 <ProjectDir Condition="Exists('$(ProjectDir).dotnet-runtime-placeholder')">$(ProjectDir)\src\coreclr\</ProjectDir>
 <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir>
 <TestWorkingDir Condition="'$(__TestWorkingDir)'==''">$(RootBinDir)tests\$(__BuildOS).$(__BuildArch).$(__BuildType)\</TestWorkingDir>
 <TargetsWindows Condition="'$(__BuildOS)' == 'Windows_NT'">true</TargetsWindows>
Expand DownExpand Up@@ -149,7 +150,7 @@
 </PropertyGroup>

 <ItemGroup>
 <_ProjectsToBuild Include="..\tests\testenvironment.proj">
 <_ProjectsToBuild Include="$(ProjectDir)tests\testenvironment.proj">
 <Properties>Scenario=$(Scenario);TestEnvFileName=$(TestEnvFilePath);TargetsWindows=$(TargetsWindows)</Properties>
 </_ProjectsToBuild>
 </ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/build-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
 displayName: Install native dependencies
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 # Necessary to install correct cmake version
 - script: $(coreClrRepoRootDir)eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
 - script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
 displayName: Install native dependencies


Expand Down

20 changes: 8 additions & 12 deletions
eng/pipelines/coreclr/templates/crossgen-comparison-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,14 +40,14 @@ jobs:
 value: $(osGroup).$(hostArchType)_$(archType).$(buildConfigUpper)
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - name: binDirectory
 value: $(Build.SourcesDirectory)/bin
 value: $(coreClrRepoRoot)/bin
 - name: productDirectory
 value: $(Build.SourcesDirectory)/bin/Product
 value: $(binDirectory)/Product
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - name: binDirectory
 value: $(Build.SourcesDirectory)\bin
 value: $(coreClrRepoRoot)\bin
 - name: productDirectory
 value: $(Build.SourcesDirectory)\bin\Product
 value: $(binDirectory\Product

 # Test job depends on the corresponding build job
 dependsOn: ${{ format('build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
Expand DownExpand Up@@ -83,20 +83,16 @@ jobs:


 # Populate Core_Root
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - script: ./build-test.sh $(buildConfig) $(archType) $(crossArg) generatelayoutonly
 displayName: Populate Core_Root
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - script: build-test.cmd $(buildConfig) $(archType) generateLayoutOnly
 displayName: Populate Core_Root
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) $(buildConfig) $(archType) $(crossArg) generatelayoutonly
 displayName: Populate Core_Root


 # Create baseline output on the host (x64) machine
 - task: PythonScript@0
 displayName: Create cross-platform crossgen baseline
 inputs:
 scriptSource: 'filePath'
 scriptPath: $(Build.SourcesDirectory)/tests/scripts/crossgen_comparison.py
 scriptPath: $(coreClrRepoRoot)/tests/scripts/crossgen_comparison.py
 ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 arguments:
 crossgen_framework
Expand DownExpand Up@@ -126,7 +122,7 @@ jobs:
 Creator: $(Creator)
 WorkItemTimeout: 1:00 # 1 hour
 WorkItemDirectory: '$(binDirectory)'
 CorrelationPayloadDirectory: '$(Build.SourcesDirectory)/tests/scripts'
 CorrelationPayloadDirectory: '$(coreClrRepoRoot)/tests/scripts'
 ${{ if ne(parameters.osName, 'Windows_NT') }}:
 WorkItemCommand:
 chmod +x $HELIX_WORKITEM_PAYLOAD/Product/$(targetFlavor)/crossgen;
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/perf-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,9 @@ jobs:

 # Create Core_Root
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - script: ./build-test.sh ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
 displayName: Create Core_Root
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 # TODO: add generatelayoutonly to build-test.cmd.
 - script: build-test.cmd ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
 displayName: Create Core_Root

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/run-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,7 +250,7 @@ jobs:

 # Choose which tests to send to Helix: CoreFX or CoreCLR.
 ${{ if eq(parameters.corefxTests, true) }}:
 helixProjectArguments: '$(coreClrRepoRoot)/eng/helixcorefxtests.proj'
 helixProjectArguments: '$(Build.SourcesDirectory)/eng/helixcorefxtests.proj'
 ${{ if ne(parameters.corefxTests, true) }}:
 helixProjectArguments: '$(coreClrRepoRoot)/tests/src/helixpublishwitharcade.proj'

Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/xplat-pipeline-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,9 +80,9 @@ jobs:
 value: '/'

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)/src/coreclr
 value: '$(Build.SourcesDirectory)/src/coreclr'

 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:'
 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)'
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/build-test.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -276,7 +276,7 @@ if "%__SkipRestorePackages%" == "1" goto SkipRestoreProduct
echo %__MsgPrefix%Restoring CoreCLR product from packages

if not defined XunitTestBinBase set XunitTestBinBase=%__TestBinDir%
set "CORE_ROOT=%XunitTestBinBase%\Tests\Core_Root"
set "CORE_ROOT=%XunitTestBinBase%\Tests\Core_Root\"

set __BuildLogRootName=Restore_Product
set __BuildLog=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.log
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ build_native()
 __versionSourceFile="$intermediatesForBuild/version.c"
 if [ $__SkipGenerateVersion == 0 ]; then
 pwd
 "$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__ProjectRoot/eng/empty.csproj \
 "$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__RepoRootDir/eng/empty.csproj \
 /p:NativeVersionFile=$__versionSourceFile \
 /t:GenerateNativeVersionFile /restore \
 $__CommonMSBuildArgs $__UnprocessedBuildArgs
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/tests/runtest.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ set "__TestWorkingDir=%__RootBinDir%\tests\%__BuildOS%.%__BuildArch%.%__BuildTyp
:: Default global test environment variables
:: REVIEW: are these ever expected to be defined on entry to this script? Why? By whom?
:: REVIEW: XunitTestReportDirBase is not used in this script. Who needs to have it set?
if not defined XunitTestBinBase set XunitTestBinBase=%__TestWorkingDir%
if not defined XunitTestBinBase set XunitTestBinBase=%__TestWorkingDir%\
if not defined XunitTestReportDirBase set XunitTestReportDirBase=%XunitTestBinBase%\Reports\

REM At this point in the script there will be a divergence in how the tests are run.
Expand Down

9 changes: 5 additions & 4 deletions
...reclr/tests/src/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByOut/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
cmake_minimum_required (VERSION 2.6) 
project (ReversePInvokePassingByOutNative) 
project (RPIP_ByOutNative) 
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") 
include_directories("..") 
set(SOURCES 
 ReversePInvokePassingByOutNative.cpp 
) 
# Additional files to reference: 
# add the executable 
add_library (ReversePInvokePassingByOutNative SHARED ${SOURCES}) 
target_link_libraries(ReversePInvokePassingByOutNative ${LINK_LIBRARIES_ADDITIONAL}) 
add_library (RPIP_ByOutNative SHARED ${SOURCES}) 
set_property (TARGET RPIP_ByOutNative PROPERTY OUTPUT_NAME ReversePInvokePassingByOutNative)
target_link_libraries(RPIP_ByOutNative ${LINK_LIBRARIES_ADDITIONAL}) 
# add the install targets 
install (TARGETS ReversePInvokePassingByOutNative DESTINATION bin) 
install (TARGETS RPIP_ByOutNative DESTINATION bin) 

9 changes: 5 additions & 4 deletions
...reclr/tests/src/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByRef/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
cmake_minimum_required (VERSION 2.6) 
project (ReversePInvokePassingByRefNative) 
project (RPIP_ByRefNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") 
include_directories("..") 
set(SOURCES 
 ReversePInvokePassingByRefNative.cpp 
) 
# Additional files to reference: 
# add the executable 
add_library (ReversePInvokePassingByRefNative SHARED ${SOURCES}) 
target_link_libraries(ReversePInvokePassingByRefNative ${LINK_LIBRARIES_ADDITIONAL}) 
add_library (RPIP_ByRefNative SHARED ${SOURCES}) 
set_property (TARGET RPIP_ByRefNative PROPERTY OUTPUT_NAME ReversePInvokePassingByRefNative)
target_link_libraries(RPIP_ByRefNative ${LINK_LIBRARIES_ADDITIONAL}) 
# add the install targets 
install (TARGETS ReversePInvokePassingByRefNative DESTINATION bin) 
install (TARGETS RPIP_ByRefNative DESTINATION bin) 

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Selective integration of CoreCLR PR #27836#25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

trylek
merged 1 commit into

from

Nov 13, 2019
 Merged


Selective integration of CoreCLR PR #27836
#25
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
eng/helixcorefxtests.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,6 +85,7 @@
 TODO: ProjectDir, RootBinDir, TestWorkingDir, and TargetsWindows are global properties set in dir.props, remove the property assignment here when we port to arcade.
 -->
 <ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)..\</ProjectDir>
 <ProjectDir Condition="Exists('$(ProjectDir).dotnet-runtime-placeholder')">$(ProjectDir)\src\coreclr\</ProjectDir>
 <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir>
 <TestWorkingDir Condition="'$(__TestWorkingDir)'==''">$(RootBinDir)tests\$(__BuildOS).$(__BuildArch).$(__BuildType)\</TestWorkingDir>
 <TargetsWindows Condition="'$(__BuildOS)' == 'Windows_NT'">true</TargetsWindows>
Expand DownExpand Up@@ -149,7 +150,7 @@
 </PropertyGroup>

 <ItemGroup>
 <_ProjectsToBuild Include="..\tests\testenvironment.proj">
 <_ProjectsToBuild Include="$(ProjectDir)tests\testenvironment.proj">
 <Properties>Scenario=$(Scenario);TestEnvFileName=$(TestEnvFilePath);TargetsWindows=$(TargetsWindows)</Properties>
 </_ProjectsToBuild>
 </ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/build-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
 displayName: Install native dependencies
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 # Necessary to install correct cmake version
 - script: $(coreClrRepoRootDir)eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
 - script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
 displayName: Install native dependencies


Expand Down

20 changes: 8 additions & 12 deletions
eng/pipelines/coreclr/templates/crossgen-comparison-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,14 +40,14 @@ jobs:
 value: $(osGroup).$(hostArchType)_$(archType).$(buildConfigUpper)
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - name: binDirectory
 value: $(Build.SourcesDirectory)/bin
 value: $(coreClrRepoRoot)/bin
 - name: productDirectory
 value: $(Build.SourcesDirectory)/bin/Product
 value: $(binDirectory)/Product
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - name: binDirectory
 value: $(Build.SourcesDirectory)\bin
 value: $(coreClrRepoRoot)\bin
 - name: productDirectory
 value: $(Build.SourcesDirectory)\bin\Product
 value: $(binDirectory\Product

 # Test job depends on the corresponding build job
 dependsOn: ${{ format('build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
Expand DownExpand Up@@ -83,20 +83,16 @@ jobs:


 # Populate Core_Root
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - script: ./build-test.sh $(buildConfig) $(archType) $(crossArg) generatelayoutonly
 displayName: Populate Core_Root
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - script: build-test.cmd $(buildConfig) $(archType) generateLayoutOnly
 displayName: Populate Core_Root
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) $(buildConfig) $(archType) $(crossArg) generatelayoutonly
 displayName: Populate Core_Root


 # Create baseline output on the host (x64) machine
 - task: PythonScript@0
 displayName: Create cross-platform crossgen baseline
 inputs:
 scriptSource: 'filePath'
 scriptPath: $(Build.SourcesDirectory)/tests/scripts/crossgen_comparison.py
 scriptPath: $(coreClrRepoRoot)/tests/scripts/crossgen_comparison.py
 ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 arguments:
 crossgen_framework
Expand DownExpand Up@@ -126,7 +122,7 @@ jobs:
 Creator: $(Creator)
 WorkItemTimeout: 1:00 # 1 hour
 WorkItemDirectory: '$(binDirectory)'
 CorrelationPayloadDirectory: '$(Build.SourcesDirectory)/tests/scripts'
 CorrelationPayloadDirectory: '$(coreClrRepoRoot)/tests/scripts'
 ${{ if ne(parameters.osName, 'Windows_NT') }}:
 WorkItemCommand:
 chmod +x $HELIX_WORKITEM_PAYLOAD/Product/$(targetFlavor)/crossgen;
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/perf-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,9 @@ jobs:

 # Create Core_Root
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - script: ./build-test.sh ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
 displayName: Create Core_Root
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 # TODO: add generatelayoutonly to build-test.cmd.
 - script: build-test.cmd ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
 displayName: Create Core_Root

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/run-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,7 +250,7 @@ jobs:

 # Choose which tests to send to Helix: CoreFX or CoreCLR.
 ${{ if eq(parameters.corefxTests, true) }}:
 helixProjectArguments: '$(coreClrRepoRoot)/eng/helixcorefxtests.proj'
 helixProjectArguments: '$(Build.SourcesDirectory)/eng/helixcorefxtests.proj'
 ${{ if ne(parameters.corefxTests, true) }}:
 helixProjectArguments: '$(coreClrRepoRoot)/tests/src/helixpublishwitharcade.proj'

Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/xplat-pipeline-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,9 +80,9 @@ jobs:
 value: '/'

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)/src/coreclr
 value: '$(Build.SourcesDirectory)/src/coreclr'

 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:'
 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)'
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/build-test.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -276,7 +276,7 @@ if "%__SkipRestorePackages%" == "1" goto SkipRestoreProduct
echo %__MsgPrefix%Restoring CoreCLR product from packages

if not defined XunitTestBinBase set XunitTestBinBase=%__TestBinDir%
set "CORE_ROOT=%XunitTestBinBase%\Tests\Core_Root"
set "CORE_ROOT=%XunitTestBinBase%\Tests\Core_Root\"

set __BuildLogRootName=Restore_Product
set __BuildLog=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.log
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ build_native()
 __versionSourceFile="$intermediatesForBuild/version.c"
 if [ $__SkipGenerateVersion == 0 ]; then
 pwd
 "$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__ProjectRoot/eng/empty.csproj \
 "$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__RepoRootDir/eng/empty.csproj \
 /p:NativeVersionFile=$__versionSourceFile \
 /t:GenerateNativeVersionFile /restore \
 $__CommonMSBuildArgs $__UnprocessedBuildArgs
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/tests/runtest.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ set "__TestWorkingDir=%__RootBinDir%\tests\%__BuildOS%.%__BuildArch%.%__BuildTyp
:: Default global test environment variables
:: REVIEW: are these ever expected to be defined on entry to this script? Why? By whom?
:: REVIEW: XunitTestReportDirBase is not used in this script. Who needs to have it set?
if not defined XunitTestBinBase set XunitTestBinBase=%__TestWorkingDir%
if not defined XunitTestBinBase set XunitTestBinBase=%__TestWorkingDir%\
if not defined XunitTestReportDirBase set XunitTestReportDirBase=%XunitTestBinBase%\Reports\

REM At this point in the script there will be a divergence in how the tests are run.
Expand Down

9 changes: 5 additions & 4 deletions
...reclr/tests/src/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByOut/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
cmake_minimum_required (VERSION 2.6) 
project (ReversePInvokePassingByOutNative) 
project (RPIP_ByOutNative) 
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") 
include_directories("..") 
set(SOURCES 
 ReversePInvokePassingByOutNative.cpp 
) 
# Additional files to reference: 
# add the executable 
add_library (ReversePInvokePassingByOutNative SHARED ${SOURCES}) 
target_link_libraries(ReversePInvokePassingByOutNative ${LINK_LIBRARIES_ADDITIONAL}) 
add_library (RPIP_ByOutNative SHARED ${SOURCES}) 
set_property (TARGET RPIP_ByOutNative PROPERTY OUTPUT_NAME ReversePInvokePassingByOutNative)
target_link_libraries(RPIP_ByOutNative ${LINK_LIBRARIES_ADDITIONAL}) 
# add the install targets 
install (TARGETS ReversePInvokePassingByOutNative DESTINATION bin) 
install (TARGETS RPIP_ByOutNative DESTINATION bin) 

9 changes: 5 additions & 4 deletions
...reclr/tests/src/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByRef/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
cmake_minimum_required (VERSION 2.6) 
project (ReversePInvokePassingByRefNative) 
project (RPIP_ByRefNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") 
include_directories("..") 
set(SOURCES 
 ReversePInvokePassingByRefNative.cpp 
) 
# Additional files to reference: 
# add the executable 
add_library (ReversePInvokePassingByRefNative SHARED ${SOURCES}) 
target_link_libraries(ReversePInvokePassingByRefNative ${LINK_LIBRARIES_ADDITIONAL}) 
add_library (RPIP_ByRefNative SHARED ${SOURCES}) 
set_property (TARGET RPIP_ByRefNative PROPERTY OUTPUT_NAME ReversePInvokePassingByRefNative)
target_link_libraries(RPIP_ByRefNative ${LINK_LIBRARIES_ADDITIONAL}) 
# add the install targets 
install (TARGETS ReversePInvokePassingByRefNative DESTINATION bin) 
install (TARGETS RPIP_ByRefNative DESTINATION bin) 

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Selective integration of CoreCLR PR #27836#25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

trylek
merged 1 commit into

from

Nov 13, 2019
 Merged


Selective integration of CoreCLR PR #27836
#25
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
eng/helixcorefxtests.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,6 +85,7 @@
 TODO: ProjectDir, RootBinDir, TestWorkingDir, and TargetsWindows are global properties set in dir.props, remove the property assignment here when we port to arcade.
 -->
 <ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)..\</ProjectDir>
 <ProjectDir Condition="Exists('$(ProjectDir).dotnet-runtime-placeholder')">$(ProjectDir)\src\coreclr\</ProjectDir>
 <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir>
 <TestWorkingDir Condition="'$(__TestWorkingDir)'==''">$(RootBinDir)tests\$(__BuildOS).$(__BuildArch).$(__BuildType)\</TestWorkingDir>
 <TargetsWindows Condition="'$(__BuildOS)' == 'Windows_NT'">true</TargetsWindows>
Expand DownExpand Up@@ -149,7 +150,7 @@
 </PropertyGroup>

 <ItemGroup>
 <_ProjectsToBuild Include="..\tests\testenvironment.proj">
 <_ProjectsToBuild Include="$(ProjectDir)tests\testenvironment.proj">
 <Properties>Scenario=$(Scenario);TestEnvFileName=$(TestEnvFilePath);TargetsWindows=$(TargetsWindows)</Properties>
 </_ProjectsToBuild>
 </ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/build-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
 displayName: Install native dependencies
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 # Necessary to install correct cmake version
 - script: $(coreClrRepoRootDir)eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
 - script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
 displayName: Install native dependencies


Expand Down

20 changes: 8 additions & 12 deletions
eng/pipelines/coreclr/templates/crossgen-comparison-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,14 +40,14 @@ jobs:
 value: $(osGroup).$(hostArchType)_$(archType).$(buildConfigUpper)
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - name: binDirectory
 value: $(Build.SourcesDirectory)/bin
 value: $(coreClrRepoRoot)/bin
 - name: productDirectory
 value: $(Build.SourcesDirectory)/bin/Product
 value: $(binDirectory)/Product
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - name: binDirectory
 value: $(Build.SourcesDirectory)\bin
 value: $(coreClrRepoRoot)\bin
 - name: productDirectory
 value: $(Build.SourcesDirectory)\bin\Product
 value: $(binDirectory\Product

 # Test job depends on the corresponding build job
 dependsOn: ${{ format('build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
Expand DownExpand Up@@ -83,20 +83,16 @@ jobs:


 # Populate Core_Root
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - script: ./build-test.sh $(buildConfig) $(archType) $(crossArg) generatelayoutonly
 displayName: Populate Core_Root
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - script: build-test.cmd $(buildConfig) $(archType) generateLayoutOnly
 displayName: Populate Core_Root
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) $(buildConfig) $(archType) $(crossArg) generatelayoutonly
 displayName: Populate Core_Root


 # Create baseline output on the host (x64) machine
 - task: PythonScript@0
 displayName: Create cross-platform crossgen baseline
 inputs:
 scriptSource: 'filePath'
 scriptPath: $(Build.SourcesDirectory)/tests/scripts/crossgen_comparison.py
 scriptPath: $(coreClrRepoRoot)/tests/scripts/crossgen_comparison.py
 ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 arguments:
 crossgen_framework
Expand DownExpand Up@@ -126,7 +122,7 @@ jobs:
 Creator: $(Creator)
 WorkItemTimeout: 1:00 # 1 hour
 WorkItemDirectory: '$(binDirectory)'
 CorrelationPayloadDirectory: '$(Build.SourcesDirectory)/tests/scripts'
 CorrelationPayloadDirectory: '$(coreClrRepoRoot)/tests/scripts'
 ${{ if ne(parameters.osName, 'Windows_NT') }}:
 WorkItemCommand:
 chmod +x $HELIX_WORKITEM_PAYLOAD/Product/$(targetFlavor)/crossgen;
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/perf-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,9 @@ jobs:

 # Create Core_Root
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - script: ./build-test.sh ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
 displayName: Create Core_Root
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 # TODO: add generatelayoutonly to build-test.cmd.
 - script: build-test.cmd ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
 displayName: Create Core_Root

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/run-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,7 +250,7 @@ jobs:

 # Choose which tests to send to Helix: CoreFX or CoreCLR.
 ${{ if eq(parameters.corefxTests, true) }}:
 helixProjectArguments: '$(coreClrRepoRoot)/eng/helixcorefxtests.proj'
 helixProjectArguments: '$(Build.SourcesDirectory)/eng/helixcorefxtests.proj'
 ${{ if ne(parameters.corefxTests, true) }}:
 helixProjectArguments: '$(coreClrRepoRoot)/tests/src/helixpublishwitharcade.proj'

Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/xplat-pipeline-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,9 +80,9 @@ jobs:
 value: '/'

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)/src/coreclr
 value: '$(Build.SourcesDirectory)/src/coreclr'

 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:'
 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)'
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/build-test.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -276,7 +276,7 @@ if "%__SkipRestorePackages%" == "1" goto SkipRestoreProduct
echo %__MsgPrefix%Restoring CoreCLR product from packages

if not defined XunitTestBinBase set XunitTestBinBase=%__TestBinDir%
set "CORE_ROOT=%XunitTestBinBase%\Tests\Core_Root"
set "CORE_ROOT=%XunitTestBinBase%\Tests\Core_Root\"

set __BuildLogRootName=Restore_Product
set __BuildLog=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.log
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ build_native()
 __versionSourceFile="$intermediatesForBuild/version.c"
 if [ $__SkipGenerateVersion == 0 ]; then
 pwd
 "$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__ProjectRoot/eng/empty.csproj \
 "$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__RepoRootDir/eng/empty.csproj \
 /p:NativeVersionFile=$__versionSourceFile \
 /t:GenerateNativeVersionFile /restore \
 $__CommonMSBuildArgs $__UnprocessedBuildArgs
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/tests/runtest.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ set "__TestWorkingDir=%__RootBinDir%\tests\%__BuildOS%.%__BuildArch%.%__BuildTyp
:: Default global test environment variables
:: REVIEW: are these ever expected to be defined on entry to this script? Why? By whom?
:: REVIEW: XunitTestReportDirBase is not used in this script. Who needs to have it set?
if not defined XunitTestBinBase set XunitTestBinBase=%__TestWorkingDir%
if not defined XunitTestBinBase set XunitTestBinBase=%__TestWorkingDir%\
if not defined XunitTestReportDirBase set XunitTestReportDirBase=%XunitTestBinBase%\Reports\

REM At this point in the script there will be a divergence in how the tests are run.
Expand Down

9 changes: 5 additions & 4 deletions
...reclr/tests/src/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByOut/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
cmake_minimum_required (VERSION 2.6) 
project (ReversePInvokePassingByOutNative) 
project (RPIP_ByOutNative) 
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") 
include_directories("..") 
set(SOURCES 
 ReversePInvokePassingByOutNative.cpp 
) 
# Additional files to reference: 
# add the executable 
add_library (ReversePInvokePassingByOutNative SHARED ${SOURCES}) 
target_link_libraries(ReversePInvokePassingByOutNative ${LINK_LIBRARIES_ADDITIONAL}) 
add_library (RPIP_ByOutNative SHARED ${SOURCES}) 
set_property (TARGET RPIP_ByOutNative PROPERTY OUTPUT_NAME ReversePInvokePassingByOutNative)
target_link_libraries(RPIP_ByOutNative ${LINK_LIBRARIES_ADDITIONAL}) 
# add the install targets 
install (TARGETS ReversePInvokePassingByOutNative DESTINATION bin) 
install (TARGETS RPIP_ByOutNative DESTINATION bin) 

9 changes: 5 additions & 4 deletions
...reclr/tests/src/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByRef/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
cmake_minimum_required (VERSION 2.6) 
project (ReversePInvokePassingByRefNative) 
project (RPIP_ByRefNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") 
include_directories("..") 
set(SOURCES 
 ReversePInvokePassingByRefNative.cpp 
) 
# Additional files to reference: 
# add the executable 
add_library (ReversePInvokePassingByRefNative SHARED ${SOURCES}) 
target_link_libraries(ReversePInvokePassingByRefNative ${LINK_LIBRARIES_ADDITIONAL}) 
add_library (RPIP_ByRefNative SHARED ${SOURCES}) 
set_property (TARGET RPIP_ByRefNative PROPERTY OUTPUT_NAME ReversePInvokePassingByRefNative)
target_link_libraries(RPIP_ByRefNative ${LINK_LIBRARIES_ADDITIONAL}) 
# add the install targets 
install (TARGETS ReversePInvokePassingByRefNative DESTINATION bin) 
install (TARGETS RPIP_ByRefNative DESTINATION bin) 

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Selective integration of CoreCLR PR #27836#25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

trylek
merged 1 commit into

from

Nov 13, 2019
 Merged


Selective integration of CoreCLR PR #27836
#25
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
eng/helixcorefxtests.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,6 +85,7 @@
 TODO: ProjectDir, RootBinDir, TestWorkingDir, and TargetsWindows are global properties set in dir.props, remove the property assignment here when we port to arcade.
 -->
 <ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)..\</ProjectDir>
 <ProjectDir Condition="Exists('$(ProjectDir).dotnet-runtime-placeholder')">$(ProjectDir)\src\coreclr\</ProjectDir>
 <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir>
 <TestWorkingDir Condition="'$(__TestWorkingDir)'==''">$(RootBinDir)tests\$(__BuildOS).$(__BuildArch).$(__BuildType)\</TestWorkingDir>
 <TargetsWindows Condition="'$(__BuildOS)' == 'Windows_NT'">true</TargetsWindows>
Expand DownExpand Up@@ -149,7 +150,7 @@
 </PropertyGroup>

 <ItemGroup>
 <_ProjectsToBuild Include="..\tests\testenvironment.proj">
 <_ProjectsToBuild Include="$(ProjectDir)tests\testenvironment.proj">
 <Properties>Scenario=$(Scenario);TestEnvFileName=$(TestEnvFilePath);TargetsWindows=$(TargetsWindows)</Properties>
 </_ProjectsToBuild>
 </ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/build-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
 displayName: Install native dependencies
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 # Necessary to install correct cmake version
 - script: $(coreClrRepoRootDir)eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
 - script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
 displayName: Install native dependencies


Expand Down

20 changes: 8 additions & 12 deletions
eng/pipelines/coreclr/templates/crossgen-comparison-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,14 +40,14 @@ jobs:
 value: $(osGroup).$(hostArchType)_$(archType).$(buildConfigUpper)
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - name: binDirectory
 value: $(Build.SourcesDirectory)/bin
 value: $(coreClrRepoRoot)/bin
 - name: productDirectory
 value: $(Build.SourcesDirectory)/bin/Product
 value: $(binDirectory)/Product
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - name: binDirectory
 value: $(Build.SourcesDirectory)\bin
 value: $(coreClrRepoRoot)\bin
 - name: productDirectory
 value: $(Build.SourcesDirectory)\bin\Product
 value: $(binDirectory\Product

 # Test job depends on the corresponding build job
 dependsOn: ${{ format('build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
Expand DownExpand Up@@ -83,20 +83,16 @@ jobs:


 # Populate Core_Root
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - script: ./build-test.sh $(buildConfig) $(archType) $(crossArg) generatelayoutonly
 displayName: Populate Core_Root
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - script: build-test.cmd $(buildConfig) $(archType) generateLayoutOnly
 displayName: Populate Core_Root
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) $(buildConfig) $(archType) $(crossArg) generatelayoutonly
 displayName: Populate Core_Root


 # Create baseline output on the host (x64) machine
 - task: PythonScript@0
 displayName: Create cross-platform crossgen baseline
 inputs:
 scriptSource: 'filePath'
 scriptPath: $(Build.SourcesDirectory)/tests/scripts/crossgen_comparison.py
 scriptPath: $(coreClrRepoRoot)/tests/scripts/crossgen_comparison.py
 ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 arguments:
 crossgen_framework
Expand DownExpand Up@@ -126,7 +122,7 @@ jobs:
 Creator: $(Creator)
 WorkItemTimeout: 1:00 # 1 hour
 WorkItemDirectory: '$(binDirectory)'
 CorrelationPayloadDirectory: '$(Build.SourcesDirectory)/tests/scripts'
 CorrelationPayloadDirectory: '$(coreClrRepoRoot)/tests/scripts'
 ${{ if ne(parameters.osName, 'Windows_NT') }}:
 WorkItemCommand:
 chmod +x $HELIX_WORKITEM_PAYLOAD/Product/$(targetFlavor)/crossgen;
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/perf-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,9 @@ jobs:

 # Create Core_Root
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - script: ./build-test.sh ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
 displayName: Create Core_Root
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 # TODO: add generatelayoutonly to build-test.cmd.
 - script: build-test.cmd ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
 displayName: Create Core_Root

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/run-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,7 +250,7 @@ jobs:

 # Choose which tests to send to Helix: CoreFX or CoreCLR.
 ${{ if eq(parameters.corefxTests, true) }}:
 helixProjectArguments: '$(coreClrRepoRoot)/eng/helixcorefxtests.proj'
 helixProjectArguments: '$(Build.SourcesDirectory)/eng/helixcorefxtests.proj'
 ${{ if ne(parameters.corefxTests, true) }}:
 helixProjectArguments: '$(coreClrRepoRoot)/tests/src/helixpublishwitharcade.proj'

Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/xplat-pipeline-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,9 +80,9 @@ jobs:
 value: '/'

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)/src/coreclr
 value: '$(Build.SourcesDirectory)/src/coreclr'

 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:'
 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)'
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/build-test.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -276,7 +276,7 @@ if "%__SkipRestorePackages%" == "1" goto SkipRestoreProduct
echo %__MsgPrefix%Restoring CoreCLR product from packages

if not defined XunitTestBinBase set XunitTestBinBase=%__TestBinDir%
set "CORE_ROOT=%XunitTestBinBase%\Tests\Core_Root"
set "CORE_ROOT=%XunitTestBinBase%\Tests\Core_Root\"

set __BuildLogRootName=Restore_Product
set __BuildLog=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.log
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ build_native()
 __versionSourceFile="$intermediatesForBuild/version.c"
 if [ $__SkipGenerateVersion == 0 ]; then
 pwd
 "$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__ProjectRoot/eng/empty.csproj \
 "$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__RepoRootDir/eng/empty.csproj \
 /p:NativeVersionFile=$__versionSourceFile \
 /t:GenerateNativeVersionFile /restore \
 $__CommonMSBuildArgs $__UnprocessedBuildArgs
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/tests/runtest.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ set "__TestWorkingDir=%__RootBinDir%\tests\%__BuildOS%.%__BuildArch%.%__BuildTyp
:: Default global test environment variables
:: REVIEW: are these ever expected to be defined on entry to this script? Why? By whom?
:: REVIEW: XunitTestReportDirBase is not used in this script. Who needs to have it set?
if not defined XunitTestBinBase set XunitTestBinBase=%__TestWorkingDir%
if not defined XunitTestBinBase set XunitTestBinBase=%__TestWorkingDir%\
if not defined XunitTestReportDirBase set XunitTestReportDirBase=%XunitTestBinBase%\Reports\

REM At this point in the script there will be a divergence in how the tests are run.
Expand Down

9 changes: 5 additions & 4 deletions
...reclr/tests/src/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByOut/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
cmake_minimum_required (VERSION 2.6) 
project (ReversePInvokePassingByOutNative) 
project (RPIP_ByOutNative) 
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") 
include_directories("..") 
set(SOURCES 
 ReversePInvokePassingByOutNative.cpp 
) 
# Additional files to reference: 
# add the executable 
add_library (ReversePInvokePassingByOutNative SHARED ${SOURCES}) 
target_link_libraries(ReversePInvokePassingByOutNative ${LINK_LIBRARIES_ADDITIONAL}) 
add_library (RPIP_ByOutNative SHARED ${SOURCES}) 
set_property (TARGET RPIP_ByOutNative PROPERTY OUTPUT_NAME ReversePInvokePassingByOutNative)
target_link_libraries(RPIP_ByOutNative ${LINK_LIBRARIES_ADDITIONAL}) 
# add the install targets 
install (TARGETS ReversePInvokePassingByOutNative DESTINATION bin) 
install (TARGETS RPIP_ByOutNative DESTINATION bin) 

9 changes: 5 additions & 4 deletions
...reclr/tests/src/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByRef/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
cmake_minimum_required (VERSION 2.6) 
project (ReversePInvokePassingByRefNative) 
project (RPIP_ByRefNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") 
include_directories("..") 
set(SOURCES 
 ReversePInvokePassingByRefNative.cpp 
) 
# Additional files to reference: 
# add the executable 
add_library (ReversePInvokePassingByRefNative SHARED ${SOURCES}) 
target_link_libraries(ReversePInvokePassingByRefNative ${LINK_LIBRARIES_ADDITIONAL}) 
add_library (RPIP_ByRefNative SHARED ${SOURCES}) 
set_property (TARGET RPIP_ByRefNative PROPERTY OUTPUT_NAME ReversePInvokePassingByRefNative)
target_link_libraries(RPIP_ByRefNative ${LINK_LIBRARIES_ADDITIONAL}) 
# add the install targets 
install (TARGETS ReversePInvokePassingByRefNative DESTINATION bin) 
install (TARGETS RPIP_ByRefNative DESTINATION bin) 

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Selective integration of CoreCLR PR #27836#25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

trylek
merged 1 commit into

from

Nov 13, 2019
 Merged


Selective integration of CoreCLR PR #27836
#25
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
eng/helixcorefxtests.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,6 +85,7 @@
 TODO: ProjectDir, RootBinDir, TestWorkingDir, and TargetsWindows are global properties set in dir.props, remove the property assignment here when we port to arcade.
 -->
 <ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)..\</ProjectDir>
 <ProjectDir Condition="Exists('$(ProjectDir).dotnet-runtime-placeholder')">$(ProjectDir)\src\coreclr\</ProjectDir>
 <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir>
 <TestWorkingDir Condition="'$(__TestWorkingDir)'==''">$(RootBinDir)tests\$(__BuildOS).$(__BuildArch).$(__BuildType)\</TestWorkingDir>
 <TargetsWindows Condition="'$(__BuildOS)' == 'Windows_NT'">true</TargetsWindows>
Expand DownExpand Up@@ -149,7 +150,7 @@
 </PropertyGroup>

 <ItemGroup>
 <_ProjectsToBuild Include="..\tests\testenvironment.proj">
 <_ProjectsToBuild Include="$(ProjectDir)tests\testenvironment.proj">
 <Properties>Scenario=$(Scenario);TestEnvFileName=$(TestEnvFilePath);TargetsWindows=$(TargetsWindows)</Properties>
 </_ProjectsToBuild>
 </ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/build-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
 displayName: Install native dependencies
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 # Necessary to install correct cmake version
 - script: $(coreClrRepoRootDir)eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
 - script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
 displayName: Install native dependencies


Expand Down

20 changes: 8 additions & 12 deletions
eng/pipelines/coreclr/templates/crossgen-comparison-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,14 +40,14 @@ jobs:
 value: $(osGroup).$(hostArchType)_$(archType).$(buildConfigUpper)
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - name: binDirectory
 value: $(Build.SourcesDirectory)/bin
 value: $(coreClrRepoRoot)/bin
 - name: productDirectory
 value: $(Build.SourcesDirectory)/bin/Product
 value: $(binDirectory)/Product
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - name: binDirectory
 value: $(Build.SourcesDirectory)\bin
 value: $(coreClrRepoRoot)\bin
 - name: productDirectory
 value: $(Build.SourcesDirectory)\bin\Product
 value: $(binDirectory\Product

 # Test job depends on the corresponding build job
 dependsOn: ${{ format('build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
Expand DownExpand Up@@ -83,20 +83,16 @@ jobs:


 # Populate Core_Root
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - script: ./build-test.sh $(buildConfig) $(archType) $(crossArg) generatelayoutonly
 displayName: Populate Core_Root
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - script: build-test.cmd $(buildConfig) $(archType) generateLayoutOnly
 displayName: Populate Core_Root
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) $(buildConfig) $(archType) $(crossArg) generatelayoutonly
 displayName: Populate Core_Root


 # Create baseline output on the host (x64) machine
 - task: PythonScript@0
 displayName: Create cross-platform crossgen baseline
 inputs:
 scriptSource: 'filePath'
 scriptPath: $(Build.SourcesDirectory)/tests/scripts/crossgen_comparison.py
 scriptPath: $(coreClrRepoRoot)/tests/scripts/crossgen_comparison.py
 ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 arguments:
 crossgen_framework
Expand DownExpand Up@@ -126,7 +122,7 @@ jobs:
 Creator: $(Creator)
 WorkItemTimeout: 1:00 # 1 hour
 WorkItemDirectory: '$(binDirectory)'
 CorrelationPayloadDirectory: '$(Build.SourcesDirectory)/tests/scripts'
 CorrelationPayloadDirectory: '$(coreClrRepoRoot)/tests/scripts'
 ${{ if ne(parameters.osName, 'Windows_NT') }}:
 WorkItemCommand:
 chmod +x $HELIX_WORKITEM_PAYLOAD/Product/$(targetFlavor)/crossgen;
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/perf-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,9 @@ jobs:

 # Create Core_Root
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - script: ./build-test.sh ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
 displayName: Create Core_Root
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 # TODO: add generatelayoutonly to build-test.cmd.
 - script: build-test.cmd ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
 displayName: Create Core_Root

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/run-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,7 +250,7 @@ jobs:

 # Choose which tests to send to Helix: CoreFX or CoreCLR.
 ${{ if eq(parameters.corefxTests, true) }}:
 helixProjectArguments: '$(coreClrRepoRoot)/eng/helixcorefxtests.proj'
 helixProjectArguments: '$(Build.SourcesDirectory)/eng/helixcorefxtests.proj'
 ${{ if ne(parameters.corefxTests, true) }}:
 helixProjectArguments: '$(coreClrRepoRoot)/tests/src/helixpublishwitharcade.proj'

Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/xplat-pipeline-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,9 +80,9 @@ jobs:
 value: '/'

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)/src/coreclr
 value: '$(Build.SourcesDirectory)/src/coreclr'

 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:'
 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)'
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/build-test.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -276,7 +276,7 @@ if "%__SkipRestorePackages%" == "1" goto SkipRestoreProduct
echo %__MsgPrefix%Restoring CoreCLR product from packages

if not defined XunitTestBinBase set XunitTestBinBase=%__TestBinDir%
set "CORE_ROOT=%XunitTestBinBase%\Tests\Core_Root"
set "CORE_ROOT=%XunitTestBinBase%\Tests\Core_Root\"

set __BuildLogRootName=Restore_Product
set __BuildLog=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.log
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ build_native()
 __versionSourceFile="$intermediatesForBuild/version.c"
 if [ $__SkipGenerateVersion == 0 ]; then
 pwd
 "$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__ProjectRoot/eng/empty.csproj \
 "$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__RepoRootDir/eng/empty.csproj \
 /p:NativeVersionFile=$__versionSourceFile \
 /t:GenerateNativeVersionFile /restore \
 $__CommonMSBuildArgs $__UnprocessedBuildArgs
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/tests/runtest.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ set "__TestWorkingDir=%__RootBinDir%\tests\%__BuildOS%.%__BuildArch%.%__BuildTyp
:: Default global test environment variables
:: REVIEW: are these ever expected to be defined on entry to this script? Why? By whom?
:: REVIEW: XunitTestReportDirBase is not used in this script. Who needs to have it set?
if not defined XunitTestBinBase set XunitTestBinBase=%__TestWorkingDir%
if not defined XunitTestBinBase set XunitTestBinBase=%__TestWorkingDir%\
if not defined XunitTestReportDirBase set XunitTestReportDirBase=%XunitTestBinBase%\Reports\

REM At this point in the script there will be a divergence in how the tests are run.
Expand Down

9 changes: 5 additions & 4 deletions
...reclr/tests/src/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByOut/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
cmake_minimum_required (VERSION 2.6) 
project (ReversePInvokePassingByOutNative) 
project (RPIP_ByOutNative) 
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") 
include_directories("..") 
set(SOURCES 
 ReversePInvokePassingByOutNative.cpp 
) 
# Additional files to reference: 
# add the executable 
add_library (ReversePInvokePassingByOutNative SHARED ${SOURCES}) 
target_link_libraries(ReversePInvokePassingByOutNative ${LINK_LIBRARIES_ADDITIONAL}) 
add_library (RPIP_ByOutNative SHARED ${SOURCES}) 
set_property (TARGET RPIP_ByOutNative PROPERTY OUTPUT_NAME ReversePInvokePassingByOutNative)
target_link_libraries(RPIP_ByOutNative ${LINK_LIBRARIES_ADDITIONAL}) 
# add the install targets 
install (TARGETS ReversePInvokePassingByOutNative DESTINATION bin) 
install (TARGETS RPIP_ByOutNative DESTINATION bin) 

9 changes: 5 additions & 4 deletions
...reclr/tests/src/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByRef/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
cmake_minimum_required (VERSION 2.6) 
project (ReversePInvokePassingByRefNative) 
project (RPIP_ByRefNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") 
include_directories("..") 
set(SOURCES 
 ReversePInvokePassingByRefNative.cpp 
) 
# Additional files to reference: 
# add the executable 
add_library (ReversePInvokePassingByRefNative SHARED ${SOURCES}) 
target_link_libraries(ReversePInvokePassingByRefNative ${LINK_LIBRARIES_ADDITIONAL}) 
add_library (RPIP_ByRefNative SHARED ${SOURCES}) 
set_property (TARGET RPIP_ByRefNative PROPERTY OUTPUT_NAME ReversePInvokePassingByRefNative)
target_link_libraries(RPIP_ByRefNative ${LINK_LIBRARIES_ADDITIONAL}) 
# add the install targets 
install (TARGETS ReversePInvokePassingByRefNative DESTINATION bin) 
install (TARGETS RPIP_ByRefNative DESTINATION bin) 

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Selective integration of CoreCLR PR #27836#25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

trylek
merged 1 commit into

from

Nov 13, 2019
 Merged


Selective integration of CoreCLR PR #27836
#25
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


3 changes: 2 additions & 1 deletion
eng/helixcorefxtests.proj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,6 +85,7 @@
 TODO: ProjectDir, RootBinDir, TestWorkingDir, and TargetsWindows are global properties set in dir.props, remove the property assignment here when we port to arcade.
 -->
 <ProjectDir Condition="'$(__ProjectDir)'==''">$(MSBuildThisFileDirectory)..\</ProjectDir>
 <ProjectDir Condition="Exists('$(ProjectDir).dotnet-runtime-placeholder')">$(ProjectDir)\src\coreclr\</ProjectDir>
 <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir>
 <TestWorkingDir Condition="'$(__TestWorkingDir)'==''">$(RootBinDir)tests\$(__BuildOS).$(__BuildArch).$(__BuildType)\</TestWorkingDir>
 <TargetsWindows Condition="'$(__BuildOS)' == 'Windows_NT'">true</TargetsWindows>
Expand DownExpand Up@@ -149,7 +150,7 @@
 </PropertyGroup>

 <ItemGroup>
 <_ProjectsToBuild Include="..\tests\testenvironment.proj">
 <_ProjectsToBuild Include="$(ProjectDir)tests\testenvironment.proj">
 <Properties>Scenario=$(Scenario);TestEnvFileName=$(TestEnvFilePath);TargetsWindows=$(TargetsWindows)</Properties>
 </_ProjectsToBuild>
 </ItemGroup>
Expand Down

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/build-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -67,7 +67,7 @@ jobs:
 displayName: Install native dependencies
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 # Necessary to install correct cmake version
 - script: $(coreClrRepoRootDir)eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
 - script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
 displayName: Install native dependencies


Expand Down

20 changes: 8 additions & 12 deletions
eng/pipelines/coreclr/templates/crossgen-comparison-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -40,14 +40,14 @@ jobs:
 value: $(osGroup).$(hostArchType)_$(archType).$(buildConfigUpper)
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - name: binDirectory
 value: $(Build.SourcesDirectory)/bin
 value: $(coreClrRepoRoot)/bin
 - name: productDirectory
 value: $(Build.SourcesDirectory)/bin/Product
 value: $(binDirectory)/Product
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - name: binDirectory
 value: $(Build.SourcesDirectory)\bin
 value: $(coreClrRepoRoot)\bin
 - name: productDirectory
 value: $(Build.SourcesDirectory)\bin\Product
 value: $(binDirectory\Product

 # Test job depends on the corresponding build job
 dependsOn: ${{ format('build_{0}{1}_{2}_{3}', parameters.osGroup, parameters.osSubgroup, parameters.archType, parameters.buildConfig) }}
Expand DownExpand Up@@ -83,20 +83,16 @@ jobs:


 # Populate Core_Root
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - script: ./build-test.sh $(buildConfig) $(archType) $(crossArg) generatelayoutonly
 displayName: Populate Core_Root
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 - script: build-test.cmd $(buildConfig) $(archType) generateLayoutOnly
 displayName: Populate Core_Root
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) $(buildConfig) $(archType) $(crossArg) generatelayoutonly
 displayName: Populate Core_Root


 # Create baseline output on the host (x64) machine
 - task: PythonScript@0
 displayName: Create cross-platform crossgen baseline
 inputs:
 scriptSource: 'filePath'
 scriptPath: $(Build.SourcesDirectory)/tests/scripts/crossgen_comparison.py
 scriptPath: $(coreClrRepoRoot)/tests/scripts/crossgen_comparison.py
 ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 arguments:
 crossgen_framework
Expand DownExpand Up@@ -126,7 +122,7 @@ jobs:
 Creator: $(Creator)
 WorkItemTimeout: 1:00 # 1 hour
 WorkItemDirectory: '$(binDirectory)'
 CorrelationPayloadDirectory: '$(Build.SourcesDirectory)/tests/scripts'
 CorrelationPayloadDirectory: '$(coreClrRepoRoot)/tests/scripts'
 ${{ if ne(parameters.osName, 'Windows_NT') }}:
 WorkItemCommand:
 chmod +x $HELIX_WORKITEM_PAYLOAD/Product/$(targetFlavor)/crossgen;
Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/perf-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -55,9 +55,9 @@ jobs:

 # Create Core_Root
 - ${{ if ne(parameters.osGroup, 'Windows_NT') }}:
 - script: ./build-test.sh ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} generatelayoutonly
 displayName: Create Core_Root
 - ${{ if eq(parameters.osGroup, 'Windows_NT') }}:
 # TODO: add generatelayoutonly to build-test.cmd.
 - script: build-test.cmd ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
 - script: $(coreClrRepoRootDir)build-test$(scriptExt) ${{ parameters.buildConfig }} ${{ parameters.archType }} skipmanaged skipnative
 displayName: Create Core_Root

2 changes: 1 addition & 1 deletion
eng/pipelines/coreclr/templates/run-test-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -250,7 +250,7 @@ jobs:

 # Choose which tests to send to Helix: CoreFX or CoreCLR.
 ${{ if eq(parameters.corefxTests, true) }}:
 helixProjectArguments: '$(coreClrRepoRoot)/eng/helixcorefxtests.proj'
 helixProjectArguments: '$(Build.SourcesDirectory)/eng/helixcorefxtests.proj'
 ${{ if ne(parameters.corefxTests, true) }}:
 helixProjectArguments: '$(coreClrRepoRoot)/tests/src/helixpublishwitharcade.proj'

Expand Down

4 changes: 2 additions & 2 deletions
eng/pipelines/coreclr/templates/xplat-pipeline-job.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -80,9 +80,9 @@ jobs:
 value: '/'

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)/src/coreclr
 value: '$(Build.SourcesDirectory)/src/coreclr'

 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:'
 - ${{ if not(startsWith(variables['Build.DefinitionName'], 'runtime')) }}:

 - name: coreClrRepoRoot
 value: '$(Build.SourcesDirectory)'
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/build-test.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -276,7 +276,7 @@ if "%__SkipRestorePackages%" == "1" goto SkipRestoreProduct
echo %__MsgPrefix%Restoring CoreCLR product from packages

if not defined XunitTestBinBase set XunitTestBinBase=%__TestBinDir%
set "CORE_ROOT=%XunitTestBinBase%\Tests\Core_Root"
set "CORE_ROOT=%XunitTestBinBase%\Tests\Core_Root\"

set __BuildLogRootName=Restore_Product
set __BuildLog=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.log
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -235,7 +235,7 @@ build_native()
 __versionSourceFile="$intermediatesForBuild/version.c"
 if [ $__SkipGenerateVersion == 0 ]; then
 pwd
 "$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__ProjectRoot/eng/empty.csproj \
 "$__RepoRootDir/eng/common/msbuild.sh" $__ArcadeScriptArgs $__RepoRootDir/eng/empty.csproj \
 /p:NativeVersionFile=$__versionSourceFile \
 /t:GenerateNativeVersionFile /restore \
 $__CommonMSBuildArgs $__UnprocessedBuildArgs
Expand Down

2 changes: 1 addition & 1 deletion
src/coreclr/tests/runtest.cmd

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,7 +118,7 @@ set "__TestWorkingDir=%__RootBinDir%\tests\%__BuildOS%.%__BuildArch%.%__BuildTyp
:: Default global test environment variables
:: REVIEW: are these ever expected to be defined on entry to this script? Why? By whom?
:: REVIEW: XunitTestReportDirBase is not used in this script. Who needs to have it set?
if not defined XunitTestBinBase set XunitTestBinBase=%__TestWorkingDir%
if not defined XunitTestBinBase set XunitTestBinBase=%__TestWorkingDir%\
if not defined XunitTestReportDirBase set XunitTestReportDirBase=%XunitTestBinBase%\Reports\

REM At this point in the script there will be a divergence in how the tests are run.
Expand Down

9 changes: 5 additions & 4 deletions
...reclr/tests/src/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByOut/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
cmake_minimum_required (VERSION 2.6) 
project (ReversePInvokePassingByOutNative) 
project (RPIP_ByOutNative) 
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") 
include_directories("..") 
set(SOURCES 
 ReversePInvokePassingByOutNative.cpp 
) 
# Additional files to reference: 
# add the executable 
add_library (ReversePInvokePassingByOutNative SHARED ${SOURCES}) 
target_link_libraries(ReversePInvokePassingByOutNative ${LINK_LIBRARIES_ADDITIONAL}) 
add_library (RPIP_ByOutNative SHARED ${SOURCES}) 
set_property (TARGET RPIP_ByOutNative PROPERTY OUTPUT_NAME ReversePInvokePassingByOutNative)
target_link_libraries(RPIP_ByOutNative ${LINK_LIBRARIES_ADDITIONAL}) 
# add the install targets 
install (TARGETS ReversePInvokePassingByOutNative DESTINATION bin) 
install (TARGETS RPIP_ByOutNative DESTINATION bin) 

9 changes: 5 additions & 4 deletions
...reclr/tests/src/Interop/PInvoke/SizeParamIndex/ReversePInvoke/PassingByRef/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
cmake_minimum_required (VERSION 2.6) 
project (ReversePInvokePassingByRefNative) 
project (RPIP_ByRefNative)
include ("${CLR_INTEROP_TEST_ROOT}/Interop.cmake") 
include_directories("..") 
set(SOURCES 
 ReversePInvokePassingByRefNative.cpp 
) 
# Additional files to reference: 
# add the executable 
add_library (ReversePInvokePassingByRefNative SHARED ${SOURCES}) 
target_link_libraries(ReversePInvokePassingByRefNative ${LINK_LIBRARIES_ADDITIONAL}) 
add_library (RPIP_ByRefNative SHARED ${SOURCES}) 
set_property (TARGET RPIP_ByRefNative PROPERTY OUTPUT_NAME ReversePInvokePassingByRefNative)
target_link_libraries(RPIP_ByRefNative ${LINK_LIBRARIES_ADDITIONAL}) 
# add the install targets 
install (TARGETS ReversePInvokePassingByRefNative DESTINATION bin) 
install (TARGETS RPIP_ByRefNative DESTINATION bin)