diff --git a/.gitignore b/.gitignore index 1d308dafc6..19ef7b5771 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ global.json msbuild.ProjectImports.zip .env scripts/tmp/ +.dotnet/ +.tools/ diff --git a/build/PackageArchive.targets b/build/PackageArchive.targets index 2d283d2e01..84b8f47c7b 100644 --- a/build/PackageArchive.targets +++ b/build/PackageArchive.targets @@ -48,6 +48,12 @@ Targets="Restore" Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(LZMAMicrosoftNETCoreApp21PackageVersion);DotNetRestoreSourcePropsPath=$(GeneratedFallbackRestoreSourcesPropsPath);DotNetBuildOffline=true;AspNetUniverseBuildOffline=true" /> + + + diff --git a/build/dependencies.props b/build/dependencies.props index 5bc3bb91b7..264caf73ba 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -55,9 +55,9 @@ 3.14.2 5.2.0 5.2.0 - 1.0.5 - 1.1.2 - 2.0.0 + 1.0.11 + 1.1.8 + 2.0.7 1.0.1 15.6.1 3.0.1 diff --git a/build/tools/templates/Archive/Archive.Library.csproj b/build/tools/templates/Archive/Archive.Library.csproj new file mode 100644 index 0000000000..20e1d88940 --- /dev/null +++ b/build/tools/templates/Archive/Archive.Library.csproj @@ -0,0 +1,17 @@ + + + + + + netstandard2.0 + false + true + true + $(RestoreSources);$(DotNetRestoreSources); + + + + + + + diff --git a/scripts/common.psm1 b/scripts/common.psm1 index 7a1fb5011f..4e43dc35fb 100644 --- a/scripts/common.psm1 +++ b/scripts/common.psm1 @@ -15,7 +15,7 @@ function Invoke-Block([scriptblock]$cmd) { # - $?: did the powershell script block throw an error # - $lastexitcode: did a windows command executed by the script block end in error if ((-not $?) -or ($lastexitcode -ne 0)) { - if(($error -ne $null)) + if ($error -ne $null) { Write-Warning $error[0] }