Skip to content
This repository was archived by the owner on Apr 8, 2020. It is now read-only.

Commit e231b29

Browse files
author
Nate McMaster
committed
automated: bulk infrastructure updates. Update bootstrapper scripts and remove unnecessary signing properties
1 parent d866239 commit e231b29

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

Directory.Build.props

-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010
<RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
1111
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)build\Key.snk</AssemblyOriginatorKeyFile>
1212
<SignAssembly>true</SignAssembly>
13-
<AssemblySigningCertName>Microsoft</AssemblySigningCertName>
14-
<PackageSigningCertName>MicrosoftNuGet</PackageSigningCertName>
15-
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
1613
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1714
</PropertyGroup>
1815
</Project>

run.ps1

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ in the file are overridden by command line parameters.
5252
Example config file:
5353
```json
5454
{
55-
"$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
56-
"channel": "dev",
55+
"$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
56+
"channel": "master",
5757
"toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools"
5858
}
5959
```
@@ -192,7 +192,7 @@ if (!$DotNetHome) {
192192
else { Join-Path $PSScriptRoot '.dotnet'}
193193
}
194194

195-
if (!$Channel) { $Channel = 'dev' }
195+
if (!$Channel) { $Channel = 'master' }
196196
if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' }
197197

198198
# Execute

run.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -220,35 +220,35 @@ if [ -f "$config_file" ]; then
220220
config_channel="$(jq -r 'select(.channel!=null) | .channel' "$config_file")"
221221
config_tools_source="$(jq -r 'select(.toolsSource!=null) | .toolsSource' "$config_file")"
222222
else
223-
_error "$config_file contains invalid JSON."
223+
__error "$config_file contains invalid JSON."
224224
exit 1
225225
fi
226226
elif __machine_has python ; then
227227
if python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then
228228
config_channel="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")"
229229
config_tools_source="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")"
230230
else
231-
_error "$config_file contains invalid JSON."
231+
__error "$config_file contains invalid JSON."
232232
exit 1
233233
fi
234234
elif __machine_has python3 ; then
235235
if python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then
236236
config_channel="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")"
237237
config_tools_source="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")"
238238
else
239-
_error "$config_file contains invalid JSON."
239+
__error "$config_file contains invalid JSON."
240240
exit 1
241241
fi
242242
else
243-
_error 'Missing required command: jq or python. Could not parse the JSON file.'
243+
__error 'Missing required command: jq or python. Could not parse the JSON file.'
244244
exit 1
245245
fi
246246

247247
[ ! -z "${config_channel:-}" ] && channel="$config_channel"
248248
[ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source"
249249
fi
250250

251-
[ -z "$channel" ] && channel='dev'
251+
[ -z "$channel" ] && channel='master'
252252
[ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools'
253253

254254
get_korebuild

0 commit comments

Comments
 (0)