Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Fix diagnostic output for the DbProviderFactory elements added and removed while installing the VS designer components. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
ea4b6c0c7341df56eae7e2ba4c5c64d9 |
User & Date: | mistachkin 2012-01-28 10:05:15.176 |
Context
2012-01-28
| ||
10:25 | VS designer component installer test changes. check-in: 22a23a6461 user: mistachkin tags: trunk | |
10:05 | Fix diagnostic output for the DbProviderFactory elements added and removed while installing the VS designer components. check-in: ea4b6c0c73 user: mistachkin tags: trunk | |
2012-01-27
| ||
23:45 | Fix typo in date of release for 1.0.78.0. check-in: 2965870929 user: mistachkin tags: trunk | |
Changes
Changes to tools/install/Installer.cs.
︙ | ︙ | |||
4333 4334 4335 4336 4337 4338 4339 | { bool dirty = false; XmlDocument document = new XmlDocument(); document.PreserveWhitespace = true; document.Load(fileName); | | | | | | | | | | | | | | | | | | | | | 4333 4334 4335 4336 4337 4338 4339 4340 4341 4342 4343 4344 4345 4346 4347 4348 4349 4350 4351 4352 4353 4354 4355 4356 4357 4358 4359 4360 4361 4362 4363 4364 4365 4366 4367 4368 4369 4370 4371 4372 4373 4374 4375 4376 4377 4378 4379 4380 4381 4382 4383 4384 4385 4386 4387 4388 4389 4390 4391 4392 4393 4394 4395 4396 4397 4398 4399 4400 4401 4402 4403 4404 4405 4406 4407 4408 4409 4410 4411 4412 4413 4414 4415 4416 4417 4418 4419 | { bool dirty = false; XmlDocument document = new XmlDocument(); document.PreserveWhitespace = true; document.Load(fileName); XmlElement addElement = document.SelectSingleNode( String.Format(XPathForAddElement, invariant)) as XmlElement; if (addElement == null) { string[] elementNames = { "system.data", "DbProviderFactories" }; XmlElement previousElement = document.DocumentElement; /* configuration */ foreach (string elementName in elementNames) { addElement = previousElement.SelectSingleNode( elementName) as XmlElement; if (addElement == null) { addElement = document.CreateElement( elementName, String.Empty); previousElement.AppendChild(addElement); } previousElement = addElement; } addElement = document.CreateElement( "add", String.Empty); previousElement.AppendChild(addElement); dirty = true; } if (!String.Equals(addElement.GetAttribute("name"), name, StringComparison.InvariantCulture)) { addElement.SetAttribute("name", name); dirty = true; } if (!String.Equals(addElement.GetAttribute("invariant"), invariant, StringComparison.InvariantCulture)) { addElement.SetAttribute("invariant", invariant); dirty = true; } if (!String.Equals(addElement.GetAttribute("description"), description, StringComparison.InvariantCulture)) { addElement.SetAttribute("description", description); dirty = true; } string fullTypeName = String.Format("{0}, {1}", typeName, assemblyName); if (!String.Equals(addElement.GetAttribute("type"), fullTypeName, StringComparison.InvariantCulture)) { addElement.SetAttribute("type", fullTypeName); dirty = true; } if (dirty || whatIf) { if (verbose) TraceOps.DebugAndTrace(TracePriority.Highest, debugCallback, traceCallback, String.Format( "addElement = {0}", ForDisplay(addElement)), traceCategory); if (!whatIf) document.Save(fileName); saved = true; } |
︙ | ︙ | |||
4435 4436 4437 4438 4439 4440 4441 | { bool dirty = false; XmlDocument document = new XmlDocument(); document.PreserveWhitespace = true; document.Load(fileName); | | | | | | | | | | > | 4435 4436 4437 4438 4439 4440 4441 4442 4443 4444 4445 4446 4447 4448 4449 4450 4451 4452 4453 4454 4455 4456 4457 4458 4459 4460 4461 4462 4463 4464 4465 4466 4467 4468 4469 4470 4471 4472 4473 | { bool dirty = false; XmlDocument document = new XmlDocument(); document.PreserveWhitespace = true; document.Load(fileName); XmlElement addElement = document.SelectSingleNode( String.Format(XPathForAddElement, invariant)) as XmlElement; if (addElement != null) { addElement.ParentNode.RemoveChild(addElement); dirty = true; } XmlElement removeElement = document.SelectSingleNode( String.Format(XPathForRemoveElement, invariant)) as XmlElement; if (removeElement != null) { removeElement.ParentNode.RemoveChild(removeElement); dirty = true; } if (dirty || whatIf) { if (verbose) TraceOps.DebugAndTrace(TracePriority.Highest, debugCallback, traceCallback, String.Format( "addElement = {0}, removeElement = {1}", ForDisplay(addElement), ForDisplay(removeElement)), traceCategory); if (!whatIf) document.Save(fileName); saved = true; } |
︙ | ︙ |