Skip to content

Commit 2a7df65

Browse files
author
José Rivero
authored
Updated dotnet channels and fixed glob pattern for output bin folder (#172)
1 parent f4c140b commit 2a7df65

File tree

2 files changed

+8
-15
lines changed

2 files changed

+8
-15
lines changed

scripts/dotnet.py

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -226,16 +226,10 @@ def __find_build_directory(
226226
Attempts to get the output directory where the built artifacts are in
227227
with respect to the current working directory.
228228
'''
229-
if platform == 'win32':
230-
pattern = '*/{Configuration}/{TargetFramework}/'.format(
231-
Configuration=configuration,
232-
TargetFramework=framework
233-
)
234-
else:
235-
pattern = '*{Configuration}/*{TargetFramework}/'.format(
236-
Configuration=configuration,
237-
TargetFramework=framework
238-
)
229+
pattern = '**/{Configuration}/{TargetFramework}'.format(
230+
Configuration=configuration,
231+
TargetFramework=framework
232+
)
239233

240234
for path_name in iglob(pattern, recursive=True):
241235
if path.isdir(path_name):
@@ -353,10 +347,9 @@ def __process_arguments(args: list):
353347
# TODO: Could pull this information from repository.
354348
SUPPORTED_CHANNELS = [
355349
'master', # Default channel
356-
'release/2.2.2xx',
357-
'release/2.2.1xx',
358-
'release/2.1',
359-
'release/2.0.0',
350+
'2.2',
351+
'2.1',
352+
'2.0',
360353
'LTS',
361354
]
362355
install_parser.add_argument(

scripts/micro_benchmarks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def __get_framework_channel_map() -> dict:
6363
# TODO: Can we do better? For example, read it from csproj?
6464
return {
6565
'netcoreapp3.0': 'master',
66-
'netcoreapp2.2': 'release/2.2.2xx',
66+
'netcoreapp2.2': '2.2',
6767
'netcoreapp2.1': '2.1',
6868
'netcoreapp2.0': '2.0',
6969
}

0 commit comments

Comments
 (0)