Drop tools back to Microsoft.NETCore.App 1.0.1
This commit is contained in:
parent
d5c0c29a0c
commit
975e22ad06
|
|
@ -1 +1 @@
|
||||||
1.0.0-preview3-003981
|
1.0.0-preview3-004007
|
||||||
|
|
@ -68,6 +68,5 @@ $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
|
||||||
$dotnetHome = "$buildFolder\.dotnet"
|
$dotnetHome = "$buildFolder\.dotnet"
|
||||||
mkdir $dotnetHome -ErrorAction Ignore | Out-Null
|
mkdir $dotnetHome -ErrorAction Ignore | Out-Null
|
||||||
& .\dotnet-install.ps1 -Version $(Get-Content .\CliToolVersion.txt) -InstallDir $dotnetHome
|
& .\dotnet-install.ps1 -Version $(Get-Content .\CliToolVersion.txt) -InstallDir $dotnetHome
|
||||||
& .\dotnet-install.ps1 -Version 1.1.0-preview1-001100-00 -Channel release/1.1.0 -SharedRuntime -InstallDir $dotnetHome
|
|
||||||
|
|
||||||
&"$buildFile" $args
|
&"$buildFile" $args
|
||||||
1
build.sh
1
build.sh
|
|
@ -47,6 +47,5 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
|
||||||
dotnetHome="$buildFolder/.dotnet"
|
dotnetHome="$buildFolder/.dotnet"
|
||||||
mkdir -p $dotnetHome
|
mkdir -p $dotnetHome
|
||||||
./dotnet-install.sh --install-dir $dotnetHome --version $(cat CliToolVersion.txt)
|
./dotnet-install.sh --install-dir $dotnetHome --version $(cat CliToolVersion.txt)
|
||||||
./dotnet-install.sh --install-dir $dotnetHome --version 1.1.0-preview1-001100-00 --channel release/1.1.0 --shared-runtime
|
|
||||||
|
|
||||||
$buildFile -r $repoFolder "$@"
|
$buildFile -r $repoFolder "$@"
|
||||||
|
|
@ -24,10 +24,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.DotNet.ProjectModel": {
|
|
||||||
"version": "1.0.0-*",
|
|
||||||
"exclude": "all"
|
|
||||||
},
|
|
||||||
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
|
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
|
||||||
"Microsoft.Extensions.CommandLineUtils": "1.1.0-*",
|
"Microsoft.Extensions.CommandLineUtils": "1.1.0-*",
|
||||||
"Microsoft.Extensions.Logging": "1.1.0-*",
|
"Microsoft.Extensions.Logging": "1.1.0-*",
|
||||||
|
|
@ -38,7 +34,7 @@
|
||||||
},
|
},
|
||||||
"Microsoft.NETCore.App": {
|
"Microsoft.NETCore.App": {
|
||||||
"type": "platform",
|
"type": "platform",
|
||||||
"version": "1.1.0-*"
|
"version": "1.0.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
|
|
|
||||||
|
|
@ -23,10 +23,10 @@
|
||||||
"Microsoft.Extensions.Logging": "1.1.0-*",
|
"Microsoft.Extensions.Logging": "1.1.0-*",
|
||||||
"Microsoft.Extensions.Logging.Console": "1.1.0-*",
|
"Microsoft.Extensions.Logging.Console": "1.1.0-*",
|
||||||
"Microsoft.NETCore.App": {
|
"Microsoft.NETCore.App": {
|
||||||
"version": "1.1.0-*",
|
"version": "1.0.1",
|
||||||
"type": "platform"
|
"type": "platform"
|
||||||
},
|
},
|
||||||
"System.Data.SqlClient": "4.3.0-*"
|
"System.Data.SqlClient": "4.1.0"
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"netcoreapp1.0": {}
|
"netcoreapp1.0": {}
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@
|
||||||
"Microsoft.Extensions.Configuration.UserSecrets": "1.1.0-*",
|
"Microsoft.Extensions.Configuration.UserSecrets": "1.1.0-*",
|
||||||
"Microsoft.Extensions.Logging": "1.1.0-*",
|
"Microsoft.Extensions.Logging": "1.1.0-*",
|
||||||
"Microsoft.NETCore.App": {
|
"Microsoft.NETCore.App": {
|
||||||
"version": "1.1.0-*",
|
"version": "1.0.1",
|
||||||
"type": "platform"
|
"type": "platform"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.NETCore.App": {
|
"Microsoft.NETCore.App": {
|
||||||
"type": "platform",
|
"type": "platform",
|
||||||
"version": "1.1.0-*"
|
"version": "1.0.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
"netcoreapp1.0": {
|
"netcoreapp1.0": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.NETCore.App": {
|
"Microsoft.NETCore.App": {
|
||||||
"version": "1.1.0-*",
|
"version": "1.0.1",
|
||||||
"type": "platform"
|
"type": "platform"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -45,7 +45,7 @@ namespace Microsoft.Extensions.Configuration.UserSecrets.Tests
|
||||||
<Compile Include=""**\*.cs"" Exclude=""Excluded.cs"" />
|
<Compile Include=""**\*.cs"" Exclude=""Excluded.cs"" />
|
||||||
|
|
||||||
<PackageReference Include=""Microsoft.NET.Sdk"" Version=""1.0.0-*"" PrivateAssets=""All"" />
|
<PackageReference Include=""Microsoft.NET.Sdk"" Version=""1.0.0-*"" PrivateAssets=""All"" />
|
||||||
<PackageReference Include=""Microsoft.NETCore.App"" Version=""1.0.0"" />
|
<PackageReference Include=""Microsoft.NETCore.App"" Version=""1.0.1"" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<Import Project=""$(MSBuildToolsPath)\Microsoft.CSharp.targets"" />
|
<Import Project=""$(MSBuildToolsPath)\Microsoft.CSharp.targets"" />
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@
|
||||||
"netcoreapp1.0": {
|
"netcoreapp1.0": {
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"Microsoft.NETCore.App": {
|
"Microsoft.NETCore.App": {
|
||||||
"version": "1.1.0-*",
|
"version": "1.0.1",
|
||||||
"type": "platform"
|
"type": "platform"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue