Skip to content

Commit

Permalink
New version of analyzers
Browse files Browse the repository at this point in the history
Update to a new version of the Roslyn Diagnostics analyzer package.
  • Loading branch information
jaredpar committed Sep 24, 2015
1 parent d6f8dc4 commit b198a33
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 12 deletions.
2 changes: 1 addition & 1 deletion build/Targets/VSL.Settings.targets
Expand Up @@ -15,7 +15,7 @@
<PropertyGroup>
<ToolsetCompilerPackageName>Microsoft.Net.Compilers</ToolsetCompilerPackageName>
<ToolsetCompilerPropsFilePath>$(NuGetPackageRoot)\Microsoft.Net.Compilers\1.1.0-beta1-20150727-01\build\Microsoft.Net.Compilers.props</ToolsetCompilerPropsFilePath>
<RoslynDiagnosticsPropsFilePath>$(NuGetPackageRoot)\Microsoft.Net.RoslynDiagnostics\1.1.1-beta1-20150814-01\build\Microsoft.Net.RoslynDiagnostics.props</RoslynDiagnosticsPropsFilePath>
<RoslynDiagnosticsPropsFilePath>$(NuGetPackageRoot)\Microsoft.Net.RoslynDiagnostics\1.1.1-beta1-20150818-01\build\Microsoft.Net.RoslynDiagnostics.props</RoslynDiagnosticsPropsFilePath>
<AdditionalFileItemNames>$(AdditionalFileItemNames);PublicAPI</AdditionalFileItemNames>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion build/ToolsetPackages/project.json
Expand Up @@ -4,7 +4,7 @@
"Microsoft.CodeAnalysis.Test.Resources.Proprietary": "1.1.0-beta1-20150817-01",
"Microsoft.DiaSymReader.Native": "1.1.0-alpha2",
"Microsoft.Net.Compilers": "1.1.0-beta1-20150727-01",
"Microsoft.Net.RoslynDiagnostics": "1.1.1-beta1-20150814-01",
"Microsoft.Net.RoslynDiagnostics": "1.1.1-beta1-20150818-01",
"FakeSign": "0.9.2",
"xunit": "1.9.2",
"xunit.runner.console": "2.1.0-beta4-build3109",
Expand Down
12 changes: 6 additions & 6 deletions build/ToolsetPackages/project.lock.json
Expand Up @@ -31,7 +31,7 @@
},
"Microsoft.DiaSymReader.Native/1.1.0-alpha2": {},
"Microsoft.Net.Compilers/1.1.0-beta1-20150727-01": {},
"Microsoft.Net.RoslynDiagnostics/1.1.1-beta1-20150814-01": {},
"Microsoft.Net.RoslynDiagnostics/1.1.1-beta1-20150818-01": {},
"Microsoft.Tpl.Dataflow/4.5.24": {
"compile": {
"lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {}
Expand Down Expand Up @@ -85,7 +85,7 @@
}
},
"Microsoft.Net.Compilers/1.1.0-beta1-20150727-01": {},
"Microsoft.Net.RoslynDiagnostics/1.1.1-beta1-20150814-01": {},
"Microsoft.Net.RoslynDiagnostics/1.1.1-beta1-20150818-01": {},
"Microsoft.Tpl.Dataflow/4.5.24": {
"compile": {
"lib/portable-net45+win8+wpa81/System.Threading.Tasks.Dataflow.dll": {}
Expand Down Expand Up @@ -1036,15 +1036,15 @@
"tools/VBCSCompiler.exe.config"
]
},
"Microsoft.Net.RoslynDiagnostics/1.1.1-beta1-20150814-01": {
"sha512": "ZsPiNo4TIlamP3VDJ7f+PzfLM2MwlQPW29Lm4gNn7j3EZvS2wu5RapJe6Edpz2OuFyZSq0U9NvNHmgM9I7W9Og==",
"Microsoft.Net.RoslynDiagnostics/1.1.1-beta1-20150818-01": {
"sha512": "gKMS7pSOjXejP+S3+pAIShKYOyfneRRZGowDiEGZDHPUZqaof7ccmFkXxWMyTy2hV00exSBqNeRZDL4IpJxuCQ==",
"type": "Package",
"files": [
"[Content_Types].xml",
"_rels/.rels",
"build/Microsoft.Net.RoslynDiagnostics.props",
"Microsoft.Net.RoslynDiagnostics.nuspec",
"package/services/metadata/core-properties/e01abf88844b465fabea2ac7ad8c8ffb.psmdcp",
"package/services/metadata/core-properties/433dcdf8a06f4dcb806e4f7f93ed8bf2.psmdcp",
"ThirdPartyNotices.rtf",
"tools/Roslyn.Diagnostics.Analyzers.CSharp.dll",
"tools/Roslyn.Diagnostics.Analyzers.dll",
Expand Down Expand Up @@ -1130,7 +1130,7 @@
"Microsoft.CodeAnalysis.Test.Resources.Proprietary >= 1.1.0-beta1-20150817-01",
"Microsoft.DiaSymReader.Native >= 1.1.0-alpha2",
"Microsoft.Net.Compilers >= 1.1.0-beta1-20150727-01",
"Microsoft.Net.RoslynDiagnostics >= 1.1.1-beta1-20150814-01",
"Microsoft.Net.RoslynDiagnostics >= 1.1.1-beta1-20150818-01",
"xunit >= 1.9.2",
"xunit.runner.console >= 2.1.0-beta4-build3109",
"xunit.runners >= 2.0.0-alpha-build2576"
Expand Down
2 changes: 1 addition & 1 deletion cibuild.sh
Expand Up @@ -79,7 +79,7 @@ restore_nuget()
{
acquire_sem_or_wait "restore_nuget"

local package_name="nuget.14.zip"
local package_name="nuget.15.zip"
local target="/tmp/$package_name"
echo "Installing NuGet Packages $target"
if [ -f $target ]; then
Expand Down
8 changes: 5 additions & 3 deletions docs/infrastructure/mono-toolset.md
Expand Up @@ -34,9 +34,11 @@ The cross platform restore works by downloading the contents of the packages dir
This is done by executing the following on a Windows box.

- Change to the root of the enlistment.
- Delete the contents of the package directory.
- Run .nuget/NuGetRestore.ps1
- Zip the packages directory (via explorer) and name it nuget.X.zip (where X is one higher than the previous number)
- delete the contents of the `~\.nuget\packages`
- Run
- `.\nuget.exe restore Roslyn.sln`
- `.\nuget.exe restore build\ToolsetPackages\project.json`
- Zip the `~\.nuget` directory (via explorer) and name it nuget.X.zip (where X is one higher than the previous number)
- Use [azcopy](https://azure.microsoft.com/en-us/documentation/articles/storage-use-azcopy) to upload to https://dotnetci.blob.core.windows.net/roslyn
- Change cibuild.sh to reference the new package.

0 comments on commit b198a33

Please sign in to comment.